Merge remote-tracking branch 'casalinux/master' into clang-3-6

Author: ras0219-msft

Build_android/boost-for-android-x86.patch

@@ -1,8 +1,8 @@
 diff --git a/build-android.sh b/build-android.sh
-index 40453f7..86f0cff 100755
+index 40453f7..7ffc050 100755
 --- a/build-android.sh
 +++ b/build-android.sh
-@@ -258,9 +258,9 @@ case "$NDK_RN" in
+@@ -258,9 +258,14 @@ case "$NDK_RN" in
  		TOOLSET=gcc-androidR8e
  		;;
  	"10 (64-bit)")
@@ -11,19 +11,24 @@ index 40453f7..86f0cff 100755
 -                TOOLSET=gcc-androidR8e
 +		TOOLCHAIN=llvm-3.4
 +		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
++		TOOLSET=clang-androidR8e
++                ;;
++	"10e-rc4 (64-bit)")
++		TOOLCHAIN=llvm-3.6
++		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
 +		TOOLSET=clang-androidR8e
                  ;;
  	*)
  		echo "Undefined or not supported Android NDK version!"
-@@ -392,6 +392,7 @@ echo "Building boost for android"
+@@ -392,6 +397,7 @@ echo "Building boost for android"
    export PATH=$AndroidBinariesPath:$PATH
    export AndroidNDKRoot
    export NO_BZIP2=1
 +  export ICONV_PATH="`pwd`/../../libiconv/x86"
 
    cxxflags=""
    for flag in $CXXFLAGS; do cxxflags="$cxxflags cxxflags=$flag"; done
-@@ -404,8 +405,12 @@ echo "Building boost for android"
+@@ -404,8 +410,12 @@ echo "Building boost for android"
           threading=multi              \
           --layout=versioned           \
           --prefix="./../$BUILD_DIR/"  \
@@ -38,7 +43,7 @@ index 40453f7..86f0cff 100755
    } | tee -a $PROGDIR/build.log
 
 diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
-index 666d4c8..9c2f67f 100644
+index 666d4c8..762753e 100644
 --- a/configs/user-config-boost-1_55_0.jam
 +++ b/configs/user-config-boost-1_55_0.jam
 @@ -41,91 +41,44 @@ import os ;
@@ -50,7 +55,7 @@ index 666d4c8..9c2f67f 100644
 +using clang : androidR8e
  :
 -arm-linux-androideabi-g++
-+$(AndroidNDKRoot)/toolchains/llvm-3.4/prebuilt/linux-x86_64/bin/clang++
++$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/clang++
  :
 -<archiver>arm-linux-androideabi-ar
 +<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/linux-x86_64"

Build_android/boost-for-android.patch

@@ -1,8 +1,8 @@
 diff --git a/build-android.sh b/build-android.sh
-index 40453f7..97a3203 100755
+index 40453f7..ad78ddf 100755
 --- a/build-android.sh
 +++ b/build-android.sh
-@@ -258,9 +258,9 @@ case "$NDK_RN" in
+@@ -258,9 +258,14 @@ case "$NDK_RN" in
  		TOOLSET=gcc-androidR8e
  		;;
  	"10 (64-bit)")
@@ -11,19 +11,24 @@ index 40453f7..97a3203 100755
 -                TOOLSET=gcc-androidR8e
 +		TOOLCHAIN=llvm-3.4
 +		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
++		TOOLSET=clang-androidR8e
++                ;;
++	"10e-rc4 (64-bit)")
++		TOOLCHAIN=llvm-3.6
++		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
 +		TOOLSET=clang-androidR8e
                  ;;
  	*)
  		echo "Undefined or not supported Android NDK version!"
-@@ -392,6 +392,7 @@ echo "Building boost for android"
+@@ -392,6 +397,7 @@ echo "Building boost for android"
    export PATH=$AndroidBinariesPath:$PATH
    export AndroidNDKRoot
    export NO_BZIP2=1
 +  export ICONV_PATH="`pwd`/../../libiconv/armeabi-v7a"
 
    cxxflags=""
    for flag in $CXXFLAGS; do cxxflags="$cxxflags cxxflags=$flag"; done
-@@ -404,8 +405,12 @@ echo "Building boost for android"
+@@ -404,8 +410,12 @@ echo "Building boost for android"
           threading=multi              \
           --layout=versioned           \
           --prefix="./../$BUILD_DIR/"  \
@@ -38,7 +43,7 @@ index 40453f7..97a3203 100755
    } | tee -a $PROGDIR/build.log
 
 diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
-index 666d4c8..5f6bab8 100644
+index 666d4c8..df597f6 100644
 --- a/configs/user-config-boost-1_55_0.jam
 +++ b/configs/user-config-boost-1_55_0.jam
 @@ -41,82 +41,41 @@ import os ;
@@ -50,7 +55,7 @@ index 666d4c8..5f6bab8 100644
 +using clang : androidR8e
  :
 -arm-linux-androideabi-g++
-+$(AndroidNDKRoot)/toolchains/llvm-3.4/prebuilt/linux-x86_64/bin/clang++
++$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/clang++
  :
 -<archiver>arm-linux-androideabi-ar
 +<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64"

Build_android/configure.sh

@@ -26,9 +26,9 @@
 
 set -e
 
-# Note: we require android ndk r10 available from
-# http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2
-# http://dl.google.com/android/ndk/android-ndk32-r10-windows-x86_64.zip
+# Note: we require android ndk r10e available from
+# http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.tar.bz2
+# http://dl.google.com/android/ndk/android-ndk-r10e-windows-x86_64.zip
 
 # -----------------
 # Parse args
@@ -184,7 +184,7 @@ then
 	then
 	    git checkout 1c95d349d5f92c5ac1c24e0ec6985272a3e3883c
 	    git reset --hard HEAD
-	    patch -p1 < "$DIR/boost-for-android.patch"
+	    git apply "$DIR/boost-for-android.patch"
 	    touch cpprestsdk.patched.stamp
 	fi
 	PATH="$PATH:$NDK_DIR" ./build-android.sh --boost=1.55.0 --with-libraries=locale,random,date_time,filesystem,system,thread,chrono "${NDK_DIR}" || exit 1
@@ -200,7 +200,7 @@ then
 	then
 	    git checkout 1c95d349d5f92c5ac1c24e0ec6985272a3e3883c
 	    git reset --hard HEAD
-	    patch -p1 < "$DIR/boost-for-android-x86.patch"
+	    git apply "$DIR/boost-for-android-x86.patch"
 	    ln -s ../Boost-for-Android/boost_1_55_0.tar.bz2 .
 	    touch cpprestsdk.patched.stamp
 	fi
@@ -230,7 +230,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=armeabi-v7a \
-	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.4 \
+	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
             -DANDROID_NATIVE_API_LEVEL=android-9 \
@@ -246,7 +246,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=armeabi-v7a \
-	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.4 \
+	    -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.6 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
 	    -DANDROID_NDK="${ANDROID_NDK}" \
@@ -262,7 +262,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=x86 \
-	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.4 \
+	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
             -DANDROID_NATIVE_API_LEVEL=android-9 \
@@ -278,7 +278,7 @@ then
 	cmake "$DIR/../Release/" \
 	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
 	    -DANDROID_ABI=x86 \
-	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.4 \
+	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.6 \
 	    -DANDROID_STL=none \
 	    -DANDROID_STL_FORCE_FEATURES=ON \
 	    -DANDROID_NDK="${ANDROID_NDK}" \

Build_android/libiconv/jni/Application.mk

@@ -1,3 +1,3 @@
-NDK_TOOLCHAIN_VERSION := clang3.4
+NDK_TOOLCHAIN_VERSION := clang
 APP_PLATFORM := android-9
 APP_ABI := armeabi-v7a x86

Build_android/openssl/Makefile

@@ -1,5 +1,5 @@
 SHELL := /bin/bash
-OPENSSL_VER = openssl-1.0.1h
+OPENSSL_VER = openssl-1.0.2d
 
 all: armeabi-v7a/lib/libssl.a x86/lib/libssl.a
 
@@ -10,7 +10,7 @@ clean:
 	rm -rf setenv-android-x86.sh
 
 setenv-android.sh:
-	wget http://wiki.openssl.org/images/7/70/Setenv-android.sh
+	wget https://wiki.openssl.org/images/7/70/Setenv-android.sh
 	mv Setenv-android.sh setenv-android.sh
 	chmod a+x setenv-android.sh
 
@@ -21,7 +21,7 @@ setenv-android-x86.sh: setenv-android.sh
 	mv setenv-android-x86.sh.tmp setenv-android-x86.sh
 
 $(OPENSSL_VER).tar.gz:
-	wget http://www.openssl.org/source/$(OPENSSL_VER).tar.gz
+	wget https://www.openssl.org/source/$(OPENSSL_VER).tar.gz
 
 armeabi-v7a/lib/libssl.a: setenv-android.sh $(OPENSSL_VER).tar.gz
 	[ -d "$(ANDROID_NDK_ROOT)" ]