Stop building Android x86 (#6938)

Author: rvandermeulen

automation/generate_android_symbols.sh

@@ -34,8 +34,8 @@ if [[ ! -f "${DUMP_SYMS_DIR}/dump_syms" ]]; then
 fi
 
 # Keep these 2 in sync.
-TARGET_ARCHS=("x86_64" "x86" "arm64" "arm")
-JNI_LIBS_TARGETS=("x86_64" "x86" "arm64-v8a" "armeabi-v7a")
+TARGET_ARCHS=("x86_64" "arm64" "arm")
+JNI_LIBS_TARGETS=("x86_64" "arm64-v8a" "armeabi-v7a")
 
 rm -rf "${OUTPUT_FOLDER}"
 mkdir -p "${OUTPUT_FOLDER}"

build.gradle

@@ -197,7 +197,6 @@ ext.rustTargets = [
     'arm',
     'arm64',
     'x86_64',
-    'x86',
 ]
 
 // Generate libs for our current platform so we can run unit tests.

docs/howtos/locally-building-jna.md

@@ -41,7 +41,6 @@ Here are the steps that worked for me:
 * Build the JNA native libraries for the target platforms of interest:
     * `ant -Dos.prefix=android-aarch64`
     * `ant -Dos.prefix=android-armv7`
-    * `ant -Dos.prefix=android-x86`
     * `ant -Dos.prefix=android-x86-64`
 
 * Package the newly-built native libraries into a JAR/AAR using `ant dist`.

libs/README.md

@@ -16,5 +16,5 @@ This directory builds the required libraries for iOS, Android and desktop platfo
 
 ### Supported architectures
 
-* Android: `TARGET_ARCHS=("x86" "x86_64" "arm64" "arm")`
+* Android: `TARGET_ARCHS=("x86_64" "arm64" "arm")`
 * iOS: `TARGET_ARCHS=("x86_64" "arm64")`

libs/build-all-android.sh

@@ -3,12 +3,12 @@
 set -euvx
 
 # Our short-names for the architectures.
-TARGET_ARCHS=("x86_64" "x86" "arm64" "arm")
+TARGET_ARCHS=("x86_64" "arm64" "arm")
 # The directories required for the Android-Gradle plugin and APK
-# layout, like `jniLibs/x86` or `lib/x86` respectively.
-TARGET_ARCHS_DISTS=("x86_64" "x86" "arm64-v8a" "armeabi-v7a")
+# layout, like `jniLibs/x86_64` or `lib/x86_64` respectively.
+TARGET_ARCHS_DISTS=("x86_64" "arm64-v8a" "armeabi-v7a")
 # The corresponding Rust target names.
-TARGET_ARCHS_TOOLCHAINS=("x86_64-linux-android" "i686-linux-android" "aarch64-linux-android" "arm-linux-androideabi")
+TARGET_ARCHS_TOOLCHAINS=("x86_64-linux-android" "aarch64-linux-android" "arm-linux-androideabi")
 
 # End of configuration.
 

libs/build-nss-android.sh

@@ -26,9 +26,6 @@ if [[ "${TOOLCHAIN}" == "x86_64-linux-android" ]]
 then
   GYP_ARCH="x64"
   NSPR_64="--enable-64bit"
-elif [[ "${TOOLCHAIN}" == "i686-linux-android" ]]
-then
-  GYP_ARCH="ia32"
 elif [[ "${TOOLCHAIN}" == "aarch64-linux-android" ]]
 then
   GYP_ARCH="arm64"
@@ -103,8 +100,14 @@ cp -p -L "${BUILD_DIR}/lib/libsoftokn_static.a" "${DIST_DIR}/lib"
 cp -p -L "${BUILD_DIR}/lib/libssl.a" "${DIST_DIR}/lib"
 # HW specific.
 # https://searchfox.org/nss/rev/0d5696b3edce5124353f03159d2aa15549db8306/lib/freebl/freebl.gyp#508-542
-if [[ "${TOOLCHAIN}" == "i686-linux-android" ]] || [[ "${TOOLCHAIN}" == "x86_64-linux-android" ]]; then
+# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/freebl/freebl.gyp#315-324
+# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/freebl/freebl.gyp#43-47
+if [[ "${TOOLCHAIN}" == "x86_64-linux-android" ]]; then
   cp -p -L "${BUILD_DIR}/lib/libgcm-aes-x86_c_lib.a" "${DIST_DIR}/lib"
+  cp -p -L "${BUILD_DIR}/lib/libintel-gcm-wrap_c_lib.a" "${DIST_DIR}/lib"
+  cp -p -L "${BUILD_DIR}/lib/libintel-gcm-s_lib.a" "${DIST_DIR}/lib"
+  cp -p -L "${BUILD_DIR}/lib/libhw-acc-crypto-avx.a" "${DIST_DIR}/lib"
+  cp -p -L "${BUILD_DIR}/lib/libhw-acc-crypto-avx2.a" "${DIST_DIR}/lib"
   cp -p -L "${BUILD_DIR}/lib/libsha-x86_c_lib.a" "${DIST_DIR}/lib"
 fi
 if [[ "${TOOLCHAIN}" == "aarch64-linux-android" ]] || [[ "${TOOLCHAIN}" == "arm-linux-androideabi" ]]; then
@@ -116,14 +119,6 @@ fi
 if [[ "${TOOLCHAIN}" == "arm-linux-androideabi" ]]; then
   cp -p -L "${BUILD_DIR}/lib/libgcm-aes-arm32-neon_c_lib.a" "${DIST_DIR}/lib"
 fi
-# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/freebl/freebl.gyp#315-324
-# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/freebl/freebl.gyp#43-47
-if [[ "${TOOLCHAIN}" == "x86_64-linux-android" ]]; then
-  cp -p -L "${BUILD_DIR}/lib/libintel-gcm-wrap_c_lib.a" "${DIST_DIR}/lib"
-  cp -p -L "${BUILD_DIR}/lib/libintel-gcm-s_lib.a" "${DIST_DIR}/lib"
-  cp -p -L "${BUILD_DIR}/lib/libhw-acc-crypto-avx.a" "${DIST_DIR}/lib"
-  cp -p -L "${BUILD_DIR}/lib/libhw-acc-crypto-avx2.a" "${DIST_DIR}/lib"
-fi
 cp -p -L "${NSPR_BUILD_DIR}/dist/lib/libplc4.a" "${DIST_DIR}/lib"
 cp -p -L "${NSPR_BUILD_DIR}/dist/lib/libplds4.a" "${DIST_DIR}/lib"
 cp -p -L "${NSPR_BUILD_DIR}/dist/lib/libnspr4.a" "${DIST_DIR}/lib"

libs/verify-android-ci-environment.sh

@@ -10,7 +10,7 @@
 
 set -e
 
-RUST_TARGETS=("aarch64-linux-android" "armv7-linux-androideabi" "i686-linux-android" "x86_64-linux-android")
+RUST_TARGETS=("aarch64-linux-android" "armv7-linux-androideabi" "x86_64-linux-android")
 
 if [[ ! -f "$(pwd)/libs/build-all.sh" ]]; then
   echo "ERROR: verify-android-ci-environment.sh should be run from the root directory of the repo"

rust-toolchain.toml

@@ -11,7 +11,6 @@ channel = "1.87.0"
 targets = [
     "aarch64-linux-android",
     "armv7-linux-androideabi",
-    "i686-linux-android",
     "x86_64-linux-android",
     "aarch64-apple-ios",
     "x86_64-apple-ios",

taskcluster/kinds/module-build/kind.yml

@@ -32,7 +32,7 @@ task-defaults:
       - [source, taskcluster/scripts/toolchain/setup-fetched-rust-toolchain.sh]
       - [source, taskcluster/scripts/toolchain/cross-compile-setup.sh]
       - [source, taskcluster/scripts/toolchain/copy-libs-dir.sh, libs]
-      - [bash, '-c', 'echo "rust.targets=arm,arm64,x86_64,x86,darwin,linux-x86-64\n" > local.properties']
+      - [bash, '-c', 'echo "rust.targets=arm,arm64,x86_64,darwin,linux-x86-64\n" > local.properties']
     gradlew:
       - ':{module_name}:assembleRelease'
       - ':{module_name}:publish'

tools/dependency_summary.py

@@ -35,7 +35,6 @@
     "armv7-linux-androideabi",
     "aarch64-linux-android",
     "aarch64-apple-darwin",
-    "i686-linux-android",
     "x86_64-linux-android",
     "x86_64-unknown-linux-gnu",
     "x86_64-apple-darwin",