From f32b27d2e4872966a360fb296acccae3e186a4a5 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 5 Dec 2017 08:50:20 -0500 Subject: remove mips support and bots The NDK has deprecated mips and mips64: https://developer.android.com/ndk/guides/abis.html Might as well clean this up now while I remember. Change-Id: Ie4b2334c75208082067cc16fe355d0349c7e0904 Reviewed-on: https://skia-review.googlesource.com/80560 Reviewed-by: Derek Sollenberger --- platform_tools/android/apps/build.gradle | 6 ------ platform_tools/android/apps/viewer/build.gradle | 2 +- platform_tools/android/bin/android_build_app | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) (limited to 'platform_tools') diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle index 08dbc9f4f6..fe56520838 100644 --- a/platform_tools/android/apps/build.gradle +++ b/platform_tools/android/apps/build.gradle @@ -73,12 +73,6 @@ def getVariantOutDir(project, variant) { } else if (variant.name.startsWith("x86")) { variantPrefix = "x86" androidLibDir = "x86" - } else if (variant.name.startsWith("mipsel")) { - variantPrefix = "mipsel" - androidLibDir = "mips" - } else if (variant.name.startsWith("mips64el")) { - variantPrefix = "mips64el" - androidLibDir = "mips64" } String skiaOutDir = null diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle index e231a6f3d0..d39e896c41 100644 --- a/platform_tools/android/apps/viewer/build.gradle +++ b/platform_tools/android/apps/viewer/build.gradle @@ -24,7 +24,7 @@ android { } sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call sourceSets.main.jniLibs.srcDir "src/main/libs" - productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; mipsel {}; mips64el {}; arm64vulkan{}; } + productFlavors { arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; } setupSkiaLibraryBuild(project, applicationVariants, "libviewer") } diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app index dae08530d2..31afe96c2d 100755 --- a/platform_tools/android/bin/android_build_app +++ b/platform_tools/android/bin/android_build_app @@ -40,10 +40,6 @@ elif target_cpu == "x86": android_variant = "x86" elif target_cpu == "x64": android_variant = "x86_64" -elif target_cpu == "mipsel": - android_variant = "mips" -elif target_cpu == "mips64el": - android_variant = "mips64" else: sys.exit("unknown target_cpu") -- cgit v1.2.3