From 5cffce1207097b5a2408ed77ec2bc1967cb39908 Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Wed, 27 May 2020 12:47:32 +0000
Subject: [PATCH] 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)
---
 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() {