Revert "Drop 32-bit support."

This reverts commit 0427ac7.
bloomberg · Jul 5, 2024 · 5853e7d · 5853e7d
1 parent 0427ac7
commit 5853e7d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -32,6 +32,8 @@ jobs:
       run: |
         ./gradlew clean \
           :OpenSSL:assembleArm64-v8a \
+          :OpenSSL:assembleArmeabi-v7a \
+          :OpenSSL:assembleX86 \
           :OpenSSL:assembleX86_64
         ./gradlew :SQLite3:amalgamate
         ./gradlew assembleRelease

diff --git a/OpenSSL/build.gradle.kts b/OpenSSL/build.gradle.kts
@@ -83,7 +83,7 @@ fun openSslWorkingDir(target: String): Provider<Directory> = archive.run {
     layout.buildDirectory.dir("generated/$target/${get().asFile.name.substringBefore(".tar.gz")}")
 }
 
-arrayOf("arm64-v8a", "x86_64").forEach {
+arrayOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64").forEach {
     val titleCaseName = it.replaceFirstChar { c -> c.uppercaseChar() }
     tasks.register<Copy>("unpackOpenSsl$titleCaseName") {
         from(tarTree(archive))
@@ -113,7 +113,7 @@ arrayOf("arm64-v8a", "x86_64").forEach {
 }
 
 tasks.register("assembleAndroid") {
-    arrayOf("Arm64-v8a", "X86_64").forEach {
+    arrayOf("Armeabi-v7a", "Arm64-v8a", "X86", "X86_64").forEach {
         dependsOn("assemble$it")
     }
 }

diff --git a/OpenSSL/build_libraries.sh b/OpenSSL/build_libraries.sh
@@ -34,10 +34,18 @@ case $(uname -a) in
 esac
 
 case ${TARGET_ABI} in
+    armeabi-v7a)
+        ARCH='android-arm -march=armv7-a'
+        OFFSET=32
+        ;;
     arm64-v8a)
         ARCH='android-arm64'
         OFFSET=64
         ;;
+    x86)
+        ARCH='android-x86'
+        OFFSET=32
+        ;;
     x86_64)
         ARCH='android64-x86_64'
         OFFSET=64

diff --git a/selekt-android-sqlcipher/build.gradle.kts b/selekt-android-sqlcipher/build.gradle.kts
@@ -34,7 +34,7 @@ repositories {
 }
 
 val developmentABIs = listOf("arm64-v8a")
-val allABIs = listOf("arm64-v8a", "x86_64")
+val allABIs = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
 android {
     compileSdk = Versions.ANDROID_SDK.version.toInt()