summaryrefslogtreecommitdiff
path: root/cc/compiler.go
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2020-05-27 12:47:32 +0000
committer Orion Hodson <oth@google.com> 2020-06-09 09:54:56 +0000
commit5cffce1207097b5a2408ed77ec2bc1967cb39908 (patch)
treeafe7bc7d0cd837453485cd974b211436e21e3526 /cc/compiler.go
parent8a624337b308f70151a9f50f8ef29fd636f7e98c (diff)
Revert^2: "Remove implict jni.h include path"
Bug: 152482542 Test: m checkbuild Change-Id: I6175d7c59734ba9b6c32457e5a9b0704d49f4106 Merged-In: I6175d7c59734ba9b6c32457e5a9b0704d49f4106 Exempt-From-Owner-Approval: approved in other branches (cherry picked from commit e3ce0ba7819ce8b85c7a33db9780effa33dec80c)
Diffstat (limited to 'cc/compiler.go')
-rw-r--r--cc/compiler.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/compiler.go b/cc/compiler.go
index 681b1ab90..e7495da88 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -300,8 +300,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
"${config.CommonGlobalIncludes}",
- tc.IncludeFlags(),
- "${config.CommonNativehelperInclude}")
+ tc.IncludeFlags())
}
if ctx.useSdk() {