commit e68926d4d3b8f954d8727350872c6c0018208fa5
author Orion Hodson <oth@google.com> Mon May 18 09:45:53 2020 +0100
committer Orion Hodson <oth@google.com> Thu Jun 04 10:44:08 2020 +0000
tree c9f82d5f0405ac9260663958a2d3110abfc85f41
parent e2054a9f9dc2de6dcf41e20cc46d068ac72ad5a7

Remove implict jni.h include path

Bug: 152482542
Test: m checkbuild
Change-Id: I7225646a31fb87879c47f71a1a919b342c9b488f
Merged-In: I7225646a31fb87879c47f71a1a919b342c9b488f
(cherry picked from commit 90e9505f56a84c13a92b965e48f769f1cca6782d)

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index 681b1ab..e7495da 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -300,8 +300,7 @@
 	if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {
 		flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
 			"${config.CommonGlobalIncludes}",
-			tc.IncludeFlags(),
-			"${config.CommonNativehelperInclude}")
+			tc.IncludeFlags())
 	}
 
 	if ctx.useSdk() {