From df3a078c9541118b09f3362cde9740cf9f47931f Mon Sep 17 00:00:00 2001
From: Michael Schwartz <schwartzmi@google.com>
Date: Thu, 30 Nov 2017 12:43:55 -0800
Subject: [PATCH] Do not archive the logs directory

Logs from a previous run interfere with the new logs.

Bug: 68327258
Test: Run script with sailfish and aosp artifacts
Change-Id: I31444f46da373b79f699f86a03337bba63146e86
---
 vndk/tools/build_mixed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vndk/tools/build_mixed b/vndk/tools/build_mixed
index 06c5c71a7..96e282bd4 100755
--- a/vndk/tools/build_mixed
+++ b/vndk/tools/build_mixed
@@ -110,7 +110,7 @@ if [ -n "$DIST_DIR" ]; then
     mkdir -p "$DIST_DIR" || true
 fi
 # Archive all the device artifacts.
-cp -R "$DEVICE_DIR"/* "$DIST_DIR"
+rsync -av --exclude='logs' "$DEVICE_DIR"/* "$DIST_DIR"
 # Overwrite the image archive with the Mixed Build archive.
 OUT_ARCHIVE="$DIST_DIR"/"$(basename $DEVICE_ARCHIVE)"
 cp "$DEVICE_IMAGES_DIR"/mixed.zip "$OUT_ARCHIVE"