commit 1e7d1bf1c7b22d2dcbdc62e952e50456d00cfa34
author Chih-Hung Hsieh <chh@google.com> Thu Mar 15 18:44:57 2018 -0700
committer Chih-Hung Hsieh <chh@google.com> Mon Mar 19 11:19:06 2018 -0700
tree 44eee9559a97df531ce7cf0d5d777e8fe12f288d
parent 45d4f09f2fff71532e276281af0597515cca058f

Use armv7a-linux-androideabi for arm device triple.

* This is a workaround of llvm LTO bug.
* Keep using current NDK include directory path.
  NDKTriple is default ClangTriple but kept as GccTriple for arm device.

Bug: 72619014
Test: make checkbuild
Change-Id: I5dc63c99760325c60bc2da98fd6a3125cef7267d

cc/makevars.go

diff --git a/cc/makevars.go b/cc/makevars.go
index 7d226d4..042af2a 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -307,7 +307,7 @@
 		ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
 		ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())
 		ctx.Strict(makePrefix+"NDK_GCC_VERSION", toolchain.GccVersion())
-		ctx.Strict(makePrefix+"NDK_TRIPLE", toolchain.ClangTriple())
+		ctx.Strict(makePrefix+"NDK_TRIPLE", config.NDKTriple(toolchain))
 	}
 
 	if target.Os.Class == android.Host || target.Os.Class == android.HostCross {