diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-12-05 08:50:20 -0500 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2017-12-05 17:19:45 +0000 |
| commit | f32b27d2e4872966a360fb296acccae3e186a4a5 (patch) | |
| tree | ca13fabaf9203ebb462aacf8dc00539f8d76b2af /gn | |
| parent | 1447177005fcbac83acd501766a46c751a49ae73 (diff) | |
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 <djsollen@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/BUILD.gn | 12 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 14 |
2 files changed, 1 insertions, 25 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 7791c1b999..363965fa98 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -137,11 +137,6 @@ config("default") { "-mfpu=neon", "-mthumb", ] - } else if (current_cpu == "mipsel") { - cflags += [ "-march=mips32r2" ] - } else if (current_cpu == "mips64el") { - asmflags += [ "-integrated-as" ] - cflags += [ "-integrated-as" ] } else if (current_cpu == "x86" && !is_win) { asmflags += [ "-m32" ] cflags += [ @@ -185,13 +180,6 @@ config("default") { "$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/lib/gcc/$ndk_target/4.9.x", ] - if (current_cpu == "mips64el") { - # The r15b NDK deployed on our bots fails to find /usr/lib64 in the - # MIPS64 sysroots, so we must point Clang at /usr/lib64 manually. - lib_dirs += [ "$ndk/platforms/$ndk_platform/usr/lib64" ] - ldflags += [ "-B$ndk/platforms/$ndk_platform/usr/lib64" ] - } - libs += [ "gnustl_static" ] } diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 646e277ca3..b81680aa88 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -13,7 +13,7 @@ declare_args() { ndk = "" # It's nice to keep ndk_api set to what Clank targets, but probably no big deal if we can't. - if (target_cpu == "x86" || target_cpu == "mipsel" || target_cpu == "arm") { + if (target_cpu == "x86" || target_cpu == "arm") { ndk_api = 16 } else { ndk_api = 21 @@ -115,18 +115,6 @@ if (is_android) { ndk_stdlib = "armeabi-v7a" ndk_gccdir = ndk_target ndk_gdbserver = "prebuilt/android-arm/gdbserver/gdbserver" - } else if (target_cpu == "mips64el") { - ndk_target = "mips64el-linux-android" - ndk_platform = "android-${ndk_api}/arch-mips64" - ndk_stdlib = "mips64" - ndk_gccdir = ndk_target - ndk_gdbserver = "prebuilt/android-mips64/gdbserver/gdbserver" - } else if (target_cpu == "mipsel") { - ndk_target = "mipsel-linux-android" - ndk_platform = "android-${ndk_api}/arch-mips" - ndk_stdlib = "mips" - ndk_gccdir = ndk_target - ndk_gdbserver = "prebuilt/android-mips/gdbserver/gdbserver" } else if (target_cpu == "x64") { ndk_target = "x86_64-linux-android" ndk_platform = "android-${ndk_api}/arch-x86_64" |