drop support for x86 to reduce build time

wownero · Oct 6, 2018 · 739be2f · 739be2f
1 parent b1b31be
commit 739be2f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -38,12 +38,12 @@ android {
         abi {
             enable true
             reset()
-            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
             universalApk true
         }
     }
     // Map for the version code that gives each ABI a value.
-    def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
+    def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86_64': 4]
 
     // Enumerate translated locales
     def availableLocales = ["en"]

diff --git a/external-libs/collect.sh b/external-libs/collect.sh
@@ -8,7 +8,7 @@ orig_path=$PATH
 build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
 packages=(boost openssl monero libsodium)
-archs=(arm arm64 x86 x86_64)
+archs=(arm arm64 x86_64)
 
 for arch in ${archs[@]}; do
     case ${arch} in
@@ -28,7 +28,7 @@ for arch in ${archs[@]}; do
 			exit 16
             ;;
     esac
-	
+
 	for package in ${packages[@]}; do
 		OUTPUT_DIR=`pwd`/$package/lib/$xarch
 		mkdir -p $OUTPUT_DIR
@@ -38,7 +38,7 @@ for arch in ${archs[@]}; do
 		if [ $package = "monero" -a -d "$build_root/build/$package/include" ]; then
 			rm -rf $OUTPUT_DIR/../../include
 		  cp -a $build_root/build/$package/include $OUTPUT_DIR/../..
-		fi		
+		fi
 
 	done
 done

diff --git a/script/build-external-libs/android-openssl/build-all-arch.sh b/script/build-external-libs/android-openssl/build-all-arch.sh
@@ -9,7 +9,7 @@ rm -rf prebuilt
 mkdir prebuilt
 
 #archs=(armeabi arm64-v8a mips mips64 x86 x86_64)
-archs=(armeabi arm64-v8a x86 x86_64)
+archs=(armeabi arm64-v8a x86_64)
 
 for arch in ${archs[@]}; do
     xLIB="/lib"

diff --git a/script/build-external-libs/build-boost.sh b/script/build-external-libs/build-boost.sh
@@ -34,11 +34,6 @@ PATH=$build_root/tool/arm64/aarch64-linux-androideabi/bin:$build_root/tool/arm64
     install
 ln -sf ../include $build_root/build/boost/arm64
 
-PATH=$build_root/tool/x86/i686-linux-android/bin:$build_root/tool/x86/bin:$PATH \
-    ./b2 --build-dir=android-x86--prefix=$build_root/build/boost/x86 $args \
-    install
-ln -sf ../include $build_root/build/boost/x86
-
 PATH=$build_root/tool/x86_64/x86_64-linux-android/bin:$build_root/tool/x86_64/bin:$PATH \
     ./b2 --build-dir=android-x86_64 --prefix=$build_root/build/boost/x86_64 $args \
     install

diff --git a/script/build-external-libs/build-libsodium.sh b/script/build-external-libs/build-libsodium.sh
@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 cd $build_root/libsodium
 ./autogen.sh
 
-archs=(arm arm64 x86 x86_64)
+archs=(arm arm64 x86_64)
 for arch in ${archs[@]}; do
     extra_cmake_flags=""
     case ${arch} in

diff --git a/script/build-external-libs/post-build-openssl.sh b/script/build-external-libs/post-build-openssl.sh
@@ -6,16 +6,16 @@ source script/build-external-libs/env.sh
 
 build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
-mkdir -p $build_root/build/openssl/{arm,arm64,x86,x86_64}
+mkdir -p $build_root/build/openssl/{arm,arm64,x86_64}
 
 cp -a $build_root/android-openssl/prebuilt/armeabi   $build_root/build/openssl/arm/lib
 cp -a $build_root/android-openssl/prebuilt/arm64-v8a $build_root/build/openssl/arm64/lib
-cp -a $build_root/android-openssl/prebuilt/x86       $build_root/build/openssl/x86/lib
 cp -a $build_root/android-openssl/prebuilt/x86_64    $build_root/build/openssl/x86_64/lib
+
 cp -aL $build_root/android-openssl/openssl-OpenSSL_1_0_2l/include/openssl/ $build_root/build/openssl/include
+
 ln -s $build_root/build/openssl/include $build_root/build/openssl/arm/include
 ln -s $build_root/build/openssl/include $build_root/build/openssl/arm64/include
-ln -s $build_root/build/openssl/include $build_root/build/openssl/x86/include
 ln -s $build_root/build/openssl/include $build_root/build/openssl/x86_64/include
 
 
@@ -25,8 +25,5 @@ ln -sf $build_root/build/openssl/arm/lib/*.so $build_root/tool/arm/sysroot/usr/l
 ln -sf $build_root/build/openssl/include $build_root/tool/arm64/sysroot/usr/include/openssl
 ln -sf $build_root/build/openssl/arm64/lib/*.so $build_root/tool/arm64/sysroot/usr/lib
 
-ln -sf $build_root/build/openssl/include $build_root/tool/x86/sysroot/usr/include/openssl
-ln -sf $build_root/build/openssl/x86/lib/*.so $build_root/tool/x86/sysroot/usr/lib
-
 ln -sf $build_root/build/openssl/include $build_root/tool/x86_64/sysroot/usr/include/openssl
 ln -sf $build_root/build/openssl/x86_64/lib/*.so $build_root/tool/x86_64/sysroot/usr/lib64
diff --git a/script/build-external-libs/prep-toolchain.sh b/script/build-external-libs/prep-toolchain.sh
@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 PATH=$ANDROID_NDK_ROOT/build/tools/:$PATH
 
 args="--api 23 --stl=libc++"
-archs=(arm arm64 x86 x86_64)
+archs=(arm arm64 x86_64)
 
 for arch in ${archs[@]}; do
 

diff --git a/script/build-external-libs/wownero/build-all-arch.sh b/script/build-external-libs/wownero/build-all-arch.sh
@@ -8,7 +8,7 @@ build_root=$EXTERNAL_LIBS_BUILD_ROOT
 
 build_type=release # or debug
 
-archs=(arm arm64 x86 x86_64)
+archs=(arm arm64 x86_64)
 
 for arch in ${archs[@]}; do
     ldflags=""