summaryrefslogtreecommitdiffstats
path: root/vndk
diff options
context:
space:
mode:
authorJustin Yun <justinyun@google.com>2019-01-06 19:19:37 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-06 19:19:37 -0800
commitebdc4f5d8b9b1be75888ef89fb05dcb5cac2134b (patch)
treea1bd2e8ac7a50daccda25c995e8442509253ffc4 /vndk
parent6424222a38e2f2851c547e39c215208146b55b35 (diff)
parent5ffb92d0e2b1c25354ace535d323ccffe07d1988 (diff)
downloadandroid_development-ebdc4f5d8b9b1be75888ef89fb05dcb5cac2134b.tar.gz
android_development-ebdc4f5d8b9b1be75888ef89fb05dcb5cac2134b.tar.bz2
android_development-ebdc4f5d8b9b1be75888ef89fb05dcb5cac2134b.zip
Merge "Update android-info.txt in dist directory." am: f2aae3b46d am: 3e73ca3207
am: 5ffb92d0e2 Change-Id: Idbf0404b388d9d4edafac00f93ef8a59c045293b
Diffstat (limited to 'vndk')
-rwxr-xr-xvndk/tools/build_mixed2
1 files changed, 2 insertions, 0 deletions
diff --git a/vndk/tools/build_mixed b/vndk/tools/build_mixed
index 5d6469aef..09d929271 100755
--- a/vndk/tools/build_mixed
+++ b/vndk/tools/build_mixed
@@ -237,3 +237,5 @@ rsync --archive --verbose --copy-links --exclude='logs' \
# Overwrite the image archive with the Mixed Build archive.
OUT_ARCHIVE="$DIST_DIR"/"$(basename $DEVICE_ARCHIVE)"
cp "$DEVICE_IMAGES_DIR"/mixed.zip "$OUT_ARCHIVE"
+# Overwrite android-info.txt with the updated one.
+cp "$DEVICE_IMAGES_DIR"/android-info.txt "$DIST_DIR"/