diff options
author | Xin Li <delphij@google.com> | 2018-08-06 17:23:22 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2018-08-06 17:23:26 -0700 |
commit | 6bfe4eb42c79d4930a71ba5ad013177b1741713f (patch) | |
tree | 2246bd09c86a770d1a4d26b415eed543affb7df6 /cc/config/global.go | |
parent | 77a69ecb70765f09f40c249a1546b5de7b2ee7f8 (diff) | |
parent | 7481ee6e6d144a509a931a80d0453ad74fb5b815 (diff) | |
download | build_soong-android-o-mr1-iot-release-1.0.3.tar.gz build_soong-android-o-mr1-iot-release-1.0.3.tar.bz2 build_soong-android-o-mr1-iot-release-1.0.3.zip |
Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3
Bug: 112104996
Change-Id: I160274b2c2bbe8219ed9a3b5d39c3935bfcb13f0
Diffstat (limited to 'cc/config/global.go')
-rw-r--r-- | cc/config/global.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index dee7640b..a49e5093 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -192,7 +192,7 @@ func init() { // This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help // with this, since there is no associated library. pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I", - []string{"libnativehelper/include_deprecated"}) + []string{"libnativehelper/include_jni"}) pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase) pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string { |