Merge changes Iac19fbd3,Id4707189
* changes:
Improve soong_zip filename collisions
Add soong_zip -D to zip whole directories
diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh
index f8ce349..197a38d 100755
--- a/scripts/build-ndk-prebuilts.sh
+++ b/scripts/build-ndk-prebuilts.sh
@@ -13,7 +13,7 @@
# PLATFORM_VERSION_ALL_CODESNAMES is a comma separated list like O,P. We need to
# turn this into ["O","P"].
-PLATFORM_VERSION_ALL_CODENAMES=${PLATFORM_VERSION_ALL_CODENAMES/,/","}
+PLATFORM_VERSION_ALL_CODENAMES=${PLATFORM_VERSION_ALL_CODENAMES/,/'","'}
PLATFORM_VERSION_ALL_CODENAMES="[\"${PLATFORM_VERSION_ALL_CODENAMES}\"]"
SOONG_OUT=${OUT_DIR}/soong