| commit | e29cac0861fe33c6a4c63087f274d547e8c5c5b8 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Fri Jun 05 15:23:25 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jun 05 15:23:25 2020 +0000 |
| tree | d4c503ce5ddfe5799d29e623e69c2710f119605e | |
| parent | 2ebae3e9365a5ff55608387917d260aa5a9a31d7 [diff] | |
| parent | 465c775ab8c6cfabd2356a399e5d5750ff87de29 [diff] |
Merge "Revert "Remove implict jni.h include path""
diff --git a/cc/compiler.go b/cc/compiler.go index e7495da..681b1ab 100644 --- a/cc/compiler.go +++ b/cc/compiler.go
@@ -300,7 +300,8 @@ if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() { flags.SystemIncludeFlags = append(flags.SystemIncludeFlags, "${config.CommonGlobalIncludes}", - tc.IncludeFlags()) + tc.IncludeFlags(), + "${config.CommonNativehelperInclude}") } if ctx.useSdk() {