Update scripts

Author: johnno1962

android/builder.sh

@@ -3,7 +3,7 @@
 # Build Android toolchain including Foundation
 #
 
-ANDROID_ICU_UC=~/libiconv-libicu-android
+ANDROID_ICU_UC="${ANDROID_ICU_UC:-~/libiconv-libicu-android}"
 
 cd "$(dirname $0)" &&
 #./prepare.sh &&

android/install.sh

@@ -3,18 +3,6 @@
 # Simple script to move Android Foundation into toolchain
 # To build it again after this, use install.sh -u to reset
 #
-# libxml2.so built from the android platform port:
-# https://github.com/android/platform_external_libxml2
-#
-# This is the most useful page found but it's not complete
-# http://stackoverflow.com/questions/12052089/using-libxml-for-android
-# Don't set CFLAGS or LDFLAGS and use ./autogen.sh instead of "configure"
-# Remove HTMLparser.lo and HTMLtree.lo from the Makefile and make sure
-# LIBXML_HTML_ENABLED and LIBXML_ICONV_ENABLED were not enabled in file
-# "include/libxml/xmlversion.h". Add the following to CFLAGS in Makefile:
-# -nostdlib --target=armv7-none-linux-androideabi
-# --sysroot=$ANDROID_NDK/platforms/android-21/arch-arm
-#
 
 cd "$(dirname $0)"
 

android/updater.sh

@@ -3,13 +3,31 @@
 # Move freshly built dependencies for Foundation into
 # build directory to be available for it's compilation.
 #
+# libxml2.so built from the android platform port:
+# https://github.com/android/platform_external_libxml2
+#
+# This is the most useful page found but it's not complete
+# http://stackoverflow.com/questions/12052089/using-libxml-for-android
+# Don't set CFLAGS or LDFLAGS and use ./autogen.sh instead of "configure"
+# Remove HTMLparser.lo and HTMLtree.lo from the Makefile and make sure
+# LIBXML_HTML_ENABLED and LIBXML_ICONV_ENABLED were not enabled in file
+# "include/libxml/xmlversion.h". Add the following to CFLAGS in Makefile:
+# -nostdlib --target=armv7-none-linux-androideabi
+# --sysroot=$ANDROID_NDK/platforms/android-21/arch-arm
+#
+# libcurl.so is built similarly from https://github.com/curl/curl
+#
+# libdispatch.so is a difficult build soon to be automated by another PR.
+#
+
+ANDROID_ICU_UC="${ANDROID_ICU_UC:-~/libiconv-libicu-android}"
 
 cd "$(dirname $0)" &&
 
 SWIFT_ROOT="$(dirname $(dirname $(which swiftc)))" &&
 BUILD_DIR="$(dirname $SWIFT_ROOT)" &&
 
-\cp -v ../../platform_external_libxml2/libxml2.so ../../curl/libcurl.so ../../swift-corelibs-libdispatch/libdispatch.so "$ANDROID_ICU"/armeabi-v7a/libicu*.so "${SWIFT_ROOT}/lib/swift/android" &&
+\cp -v ../../platform_external_libxml2/libxml2.so ../../curl/libcurl.so ../../swift-corelibs-libdispatch/libdispatch.so "$ANDROID_ICU_UC"/armeabi-v7a/libicu*.so "${SWIFT_ROOT}/lib/swift/android" &&
 
 rpl -R -e libicu libscu "${SWIFT_ROOT}/lib/swift/android"/lib{icu,swift,Foundation,xml2}*.so &&