prepare for NDK r18
NDK r18 will remove GCC, so we will no longer be able to run
build/android-arm-gcc. It's probably never been relevant.
Change-Id: I94b10c0dfe77463e45149b67c7d952947a3e066e
Reviewed-on: https://skia-review.googlesource.com/145736
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/build.ninja b/build.ninja
index 770c94c..bccc0f7 100644
--- a/build.ninja
+++ b/build.ninja
@@ -34,8 +34,6 @@
subninja build/android-arm.tiny
subninja build/android-arm.vfpv2
-subninja build/android-arm-gcc
-
subninja build/ios
subninja build/ios.portable
subninja build/ios.tiny
diff --git a/build/android-arm-gcc b/build/android-arm-gcc
deleted file mode 100644
index fbf3fd2..0000000
--- a/build/android-arm-gcc
+++ /dev/null
@@ -1,27 +0,0 @@
-ndk = ../ndk
-target = arm-linux-androideabi
-arch = arch-arm
-ndk_api = 24
-
-cc = $ndk/toolchains/${target}-4.9/prebuilt/*/bin/${target}-gcc
-cxx = $ndk/toolchains/${target}-4.9/prebuilt/*/bin/${target}-g++
-
-cflags = -fdiagnostics-color -Wall -Wextra $
- -march=armv7-a -mfpu=neon -mthumb -mfloat-abi=softfp $
- --sysroot $ndk/sysroot $
- -I $ndk/sysroot/usr/include/$target
-ldflags = -pie -fuse-ld=gold $
- --sysroot $ndk/platforms/android-$ndk_api/$arch $
- -B $ndk/toolchains/${target}-4.9/prebuilt/*/$target/bin $
- -L $ndk/toolchains/${target}-4.9/prebuilt/*/lib/gcc/$target/4.9.x
-out = out/android-arm-gcc$mode
-
-rule run
- command = if which adb >/dev/null && adb get-state >/dev/null 2>/dev/null; $
- then $
- adb push --sync profiles /data/local/tmp >/dev/null; $
- adb push $in /data/local/tmp/$in >/dev/null; $
- adb shell "cd /data/local/tmp; ./$in" > $out; $
- else touch $out; fi
- description = run $in
-include build/common
