diff --git a/README.md b/README.md index b1f8a6c..2bc99cd 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,6 @@ platforms : - android - android_arm - android_arm64 -- android_mips -- android_mips64 - android_x86 - android_x86_64 diff --git a/build_custom_app.pl b/build_custom_app.pl index 83d244f..18acdec 100755 --- a/build_custom_app.pl +++ b/build_custom_app.pl @@ -64,12 +64,6 @@ $cmd = "./kiwix-build.py --target-platform android_x86 --android-custom-app $cus $ENV{VERSION_CODE} = "3" . $version_code_base; $cmd = "./kiwix-build.py --target-platform android_x86_64 --android-custom-app $custom_app --zim-file-size $zim_size kiwix-android-custom"; system $cmd; -$ENV{VERSION_CODE} = "4" . $version_code_base; -$cmd = "./kiwix-build.py --target-platform android_mips --android-custom-app $custom_app --zim-file-size $zim_size kiwix-android-custom"; system $cmd; - -$ENV{VERSION_CODE} = "5" . $version_code_base; -$cmd = "./kiwix-build.py --target-platform android_mips64 --android-custom-app $custom_app --zim-file-size $zim_size kiwix-android-custom"; system $cmd; - # Sign apps $cmd = "./TOOLCHAINS/android-sdk-r25.2.3/build-tools/25.0.2/apksigner sign -ks \"${keystore}\" --out signed_apks/app-${version_code_base}-release-signed.apk BUILD_android_arm/kiwix-android-custom_${custom_app}/app/build/outputs/apk/${custom_app}/release/app-${custom_app}-release-unsigned.apk"; system $cmd; @@ -83,12 +77,6 @@ system $cmd; $cmd = "./TOOLCHAINS/android-sdk-r25.2.3/build-tools/25.0.2/apksigner sign -ks \"${keystore}\" --out signed_apks/app-3${version_code_base}-release-signed.apk BUILD_android_x86_64/kiwix-android-custom_${custom_app}/app/build/outputs/apk/${custom_app}/release/app-${custom_app}-release-unsigned.apk"; system $cmd; -$cmd = "./TOOLCHAINS/android-sdk-r25.2.3/build-tools/25.0.2/apksigner sign -ks \"${keystore}\" --out signed_apks/app-4${version_code_base}-release-signed.apk BUILD_android_mips/kiwix-android-custom_${custom_app}/app/build/outputs/apk/${custom_app}/release/app-${custom_app}-release-unsigned.apk"; -system $cmd; - -$cmd = "./TOOLCHAINS/android-sdk-r25.2.3/build-tools/25.0.2/apksigner sign -ks \"${keystore}\" --out signed_apks/app-5${version_code_base}-release-signed.apk BUILD_android_mips64/kiwix-android-custom_${custom_app}/app/build/outputs/apk/${custom_app}/release/app-${custom_app}-release-unsigned.apk"; -system $cmd; - # Upload $cmd = "./build_custom_app.py --step publish --custom-app ${custom_app} --google-api-key ${api_key} --zim-path content.zim --apks-dir signed_apks --content-version-code ${content_version_code}"; diff --git a/kiwixbuild/dependencies/android_ndk.py b/kiwixbuild/dependencies/android_ndk.py index fa2b00e..4fbd239 100644 --- a/kiwixbuild/dependencies/android_ndk.py +++ b/kiwixbuild/dependencies/android_ndk.py @@ -27,7 +27,7 @@ class android_ndk(Dependency): @property def api(self): - return '21' if self.arch in ('arm64', 'mips64', 'x86_64') else '14' + return '21' if self.arch in ('arm64', 'x86_64') else '14' @property def platform(self): diff --git a/kiwixbuild/platforms/android.py b/kiwixbuild/platforms/android.py index 5777b29..7e8245a 100644 --- a/kiwixbuild/platforms/android.py +++ b/kiwixbuild/platforms/android.py @@ -85,32 +85,20 @@ class AndroidArm(AndroidPlatformInfo): arch_full = 'arm-linux-androideabi' abi = 'armeabi' -class AndroidArm(AndroidPlatformInfo): +class AndroidArm64(AndroidPlatformInfo): name = 'android_arm64' arch = 'arm64' arch_full = 'aarch64-linux-android' cpu = 'aarch64' abi = 'arm64-v8a' -class AndroidArm(AndroidPlatformInfo): - name = 'android_mips' - arch = abi = 'mips' - arch_full = 'mipsel-linux-android' - cpu = 'mipsel' - -class AndroidArm(AndroidPlatformInfo): - name = 'android_mips64' - arch = abi = 'mips64' - arch_full = 'mips64el-linux-android' - cpu = 'mips64el' - -class AndroidArm(AndroidPlatformInfo): +class AndroidX86(AndroidPlatformInfo): name = 'android_x86' arch = abi = 'x86' arch_full = 'i686-linux-android' cpu = 'i686' -class AndroidArm(AndroidPlatformInfo): +class AndroidX8664(AndroidPlatformInfo): name = 'android_x86_64' arch = cpu = abi = 'x86_64' arch_full = 'x86_64-linux-android'