From 465c775ab8c6cfabd2356a399e5d5750ff87de29 Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Fri, 5 Jun 2020 15:14:52 +0000 Subject: [PATCH] Revert "Remove implict jni.h include path" This reverts commit e68926d4d3b8f954d8727350872c6c0018208fa5. Reason for revert: breaks build in various -plus-aosp branches Bug: 158293810 Change-Id: I80572f673df83161be02873b2b2acf4b2ba9a2d4 Exempt-From-Owner-Approval: revert --- cc/compiler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc/compiler.go b/cc/compiler.go index e7495da88..681b1ab90 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -300,7 +300,8 @@ 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()) + tc.IncludeFlags(), + "${config.CommonNativehelperInclude}") } if ctx.useSdk() {