commit 958fec279ed59ff630770dc0482eb10f30367a83
author Mike Klein <mtklein@google.com> Wed Jul 03 09:47:09 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 03 16:58:18 2019 +0000
tree 1b416728c134eeab4c864266a3e775372d840713
parent 628bca791189d0186a26c9279f516bd5dd19e938

easy-mode ndk

Turns out the NDK lately has clang driver wrappers
that make all the target / sysroot / -I / -L stuff easy.

Change-Id: I647909f89763ebdb193718708c3213307111cf23
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/225497
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>

build/android

diff --git a/build/android b/build/android
index adb6347..634303a 100644
--- a/build/android
+++ b/build/android
@@ -1,18 +1,9 @@
 ndk     = ../ndk
-target  = aarch64-linux-android
-arch    = arch-arm64
-ndk_api = 24
+cc      = $ndk/toolchains/llvm/prebuilt/*/bin/aarch64-linux-android24-clang
+cxx     = $ndk/toolchains/llvm/prebuilt/*/bin/aarch64-linux-android24-clang++
 
-cc      = $ndk/toolchains/llvm/prebuilt/*/bin/clang   -target $target$ndk_api
-cxx     = $ndk/toolchains/llvm/prebuilt/*/bin/clang++ -target $target$ndk_api
-
-cflags  = -fcolor-diagnostics -Weverything --sysroot $ndk/sysroot
-
-ldflags = -pie -fuse-ld=lld $
-          --sysroot $ndk/platforms/android-$ndk_api/$arch $
-          -L $ndk/toolchains/llvm/prebuilt/*/sysroot/usr/lib/$target/$ndk_api $
-          -L $ndk/toolchains/llvm/prebuilt/*/sysroot/usr/lib/$target $
-          -static-libstdc++
+cflags  = -fcolor-diagnostics -Weverything
+ldflags = -pie -fuse-ld=lld -static-libstdc++
 
 out     = out/android$mode
 

build/android-arm

diff --git a/build/android-arm b/build/android-arm
index 92201fb..6446b30 100644
--- a/build/android-arm
+++ b/build/android-arm
@@ -1,19 +1,9 @@
 ndk     = ../ndk
-target  = arm-linux-androideabi
-arch    = arch-arm
-ndk_api = 24
+cc      = $ndk/toolchains/llvm/prebuilt/*/bin/armv7a-linux-androideabi24-clang
+cxx     = $ndk/toolchains/llvm/prebuilt/*/bin/armv7a-linux-androideabi24-clang++
 
-cc      = $ndk/toolchains/llvm/prebuilt/*/bin/clang   -target $target$ndk_api
-cxx     = $ndk/toolchains/llvm/prebuilt/*/bin/clang++ -target $target$ndk_api
-
-cflags  = -fcolor-diagnostics -Weverything --sysroot $ndk/sysroot $
-          -march=armv7-a -mthumb
-
-ldflags = -pie -fuse-ld=lld $
-          --sysroot $ndk/platforms/android-$ndk_api/$arch $
-          -L $ndk/toolchains/llvm/prebuilt/*/sysroot/usr/lib/$target/$ndk_api $
-          -L $ndk/toolchains/llvm/prebuilt/*/sysroot/usr/lib/$target $
-          -static-libstdc++
+cflags  = -fcolor-diagnostics -Weverything -mthumb
+ldflags = -pie -fuse-ld=lld -static-libstdc++
 
 out     = out/android-arm$mode