diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -17,14 +17,8 @@ steps: - uses: actions/checkout@v3 - - name: rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android - run: rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android - - - name: Delete some stuff to free up disk space - run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf /opt/ghc - sudo rm -rf /usr/local/share/boost + - name: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android + run: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android - name: Install Protobuf compiler working-directory: ./scripts diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml --- a/.github/workflows/android_release.yml +++ b/.github/workflows/android_release.yml @@ -12,14 +12,8 @@ steps: - uses: actions/checkout@v3 - - name: rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android - run: rustup target add aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android - - - name: Delete some stuff to free up disk space - run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf /opt/ghc - sudo rm -rf /usr/local/share/boost + - name: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android + run: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android - name: Install Protobuf compiler working-directory: ./scripts diff --git a/native/android/app/CMakeLists.txt b/native/android/app/CMakeLists.txt --- a/native/android/app/CMakeLists.txt +++ b/native/android/app/CMakeLists.txt @@ -35,8 +35,6 @@ if(CMAKE_ANDROID_ARCH_ABI STREQUAL arm64-v8a) set(Rust_CARGO_TARGET aarch64-linux-android) -elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86) - set(Rust_CARGO_TARGET i686-linux-android) elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL x86_64) set(Rust_CARGO_TARGET x86_64-linux-android) elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL armeabi-v7a) diff --git a/native/android/app/bash/build_openssl.sh b/native/android/app/bash/build_openssl.sh --- a/native/android/app/bash/build_openssl.sh +++ b/native/android/app/bash/build_openssl.sh @@ -23,10 +23,6 @@ TARGET_ARCH="armv7a-linux-androideabi" BUILD_ARCH="android-arm" ;; -"x86") - TARGET_ARCH="i686-linux-android" - BUILD_ARCH="android-x86" - ;; "x86_64") TARGET_ARCH="x86_64-linux-android" BUILD_ARCH="android-x86_64" diff --git a/native/android/app/build.gradle b/native/android/app/build.gradle --- a/native/android/app/build.gradle +++ b/native/android/app/build.gradle @@ -128,7 +128,7 @@ */ def reactNativeArchitectures() { def value = project.getProperties().get("reactNativeArchitectures") - return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] + return value ? value.split(",") : ["armeabi-v7a", "x86_64", "arm64-v8a"] } def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR") @@ -375,7 +375,6 @@ commandLine "rustup", "target", "add", "aarch64-linux-android", "armv7-linux-androideabi", - "i686-linux-android", "x86_64-linux-android" } @@ -447,7 +446,7 @@ if (isBundleRelease) { // All of the supported ABIs // https://developer.android.com/ndk/guides/abis.html#sa - final allAbis = ["armeabi-v7a", "x86", "arm64-v8a", "x86_64"] + final allAbis = ["armeabi-v7a", "arm64-v8a", "x86_64"] logger.info("Using all architectures to build: ${allAbis}") return allAbis } @@ -636,7 +635,7 @@ // For each separate APK per architecture, set a unique version code as described here: // https://developer.android.com/studio/build/configure-apk-splits.html // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. - def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] + def versionCodes = ["armeabi-v7a": 1, "arm64-v8a": 3, "x86_64": 4] def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = diff --git a/native/android/gradle.properties b/native/android/gradle.properties --- a/native/android/gradle.properties +++ b/native/android/gradle.properties @@ -37,7 +37,7 @@ # Use this property to specify which architecture you want to build. # You can also override it from the CLI using # ./gradlew -PreactNativeArchitectures=x86_64 -reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86_64 # Use this property to enable support to the new architecture. # This will allow you to use TurboModules and the Fabric render in