From e68926d4d3b8f954d8727350872c6c0018208fa5 Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Mon, 18 May 2020 09:45:53 +0100
Subject: [PATCH] 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 | 3 +--
 1 file changed, 1 insertion(+), 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() {