Merge "Revert^2: "Remove implict jni.h include path""

This commit is contained in:
Treehugger Robot
2020-06-09 09:55:13 +00:00
committed by Gerrit Code Review

View File

@@ -300,8 +300,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() { if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags, flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
"${config.CommonGlobalIncludes}", "${config.CommonGlobalIncludes}",
tc.IncludeFlags(), tc.IncludeFlags())
"${config.CommonNativehelperInclude}")
} }
if ctx.useSdk() { if ctx.useSdk() {