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
This commit is contained in:
Chih-Hung Hsieh
2018-03-15 18:44:57 -07:00
parent 45d4f09f2f
commit 1e7d1bf1c7
4 changed files with 23 additions and 2 deletions

View File

@@ -307,7 +307,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
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 {