ICU for Android: set rpath to '$ORIGIN', adjust build scripts, remove duplicated data file and save libname.major.minor.so libraries.

extern/icu/android/aarch64/config.sh

@@ -19,9 +19,9 @@
     --with-cross-build=$CROSS_BUILD_DIR \
     CFLAGS='-Os' \
     CXXFLAGS='--std=c++17' \
-    LDFLAGS='-static-libstdc++' \
+    LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
     CC=aarch64-linux-android24-clang \
     CXX=aarch64-linux-android24-clang++ \
-    AR=aarch64-linux-android-ar \
-    RANLIB=aarch64-linux-android-ranlib \
+    AR=llvm-ar \
+    RANLIB=llvm-ranlib \
     --with-data-packaging=archive

extern/icu/android/armv7a/config.sh

@@ -19,9 +19,9 @@
     --with-cross-build=$CROSS_BUILD_DIR \
     CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
     CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
-    LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8' \
-    CC=arm-linux-androideabi-clang \
-    CXX=arm-linux-androideabi-clang++ \
-    AR=arm-linux-androideabi-ar \
-    RANLIB=arm-linux-androideabi-ranlib \
+    LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8 -Wl,-rpath=\$$ORIGIN' \
+    CC=armv7a-linux-androideabi24-clang \
+    CXX=armv7a-linux-androideabi24-clang++ \
+    AR=llvm-ar \
+    RANLIB=llvm-ranlib \
     --with-data-packaging=archive

extern/icu/android/i686/config.sh

@@ -19,7 +19,7 @@
     --with-cross-build=$CROSS_BUILD_DIR \
     CFLAGS='-Os' \
     CXXFLAGS='--std=c++17' \
-    LDFLAGS='-static-libstdc++' \
+    LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
     CC=i686-linux-android24-clang \
     CXX=i686-linux-android24-clang++ \
     AR=llvm-ar \

extern/icu/android/renameLibs.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+MAJOR=63
+MINOR=1
+
+mv libicuuc.so.$MAJOR.$MINOR libicuuc.$MAJOR.$MINOR.so
+mv libicudata.so.$MAJOR.$MINOR libicudata.$MAJOR.$MINOR.so
+mv libicui18n.so.$MAJOR.$MINOR libicui18n.$MAJOR.$MINOR.so

extern/icu/android/renameLinks.sh

@@ -1,6 +0,0 @@
-MAJOR=63
-MINOR=1
-
-rm -f libicu*so
-for i in libicu*.${MINOR}; do mv $i `basename $i .${MINOR}`; done
-for i in libicu*.${MAJOR}; do ln -s $i `basename $i .${MAJOR}`; done

extern/icu/android/x86_64/config.sh

@@ -19,7 +19,7 @@
     --with-cross-build=$CROSS_BUILD_DIR \
     CFLAGS='-Os' \
     CXXFLAGS='--std=c++17' \
-    LDFLAGS='-static-libstdc++' \
+    LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
     CC=x86_64-linux-android24-clang \
     CXX=x86_64-linux-android24-clang++ \
     AR=llvm-ar \