StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove remaining libnativehelper implicit includes" am: 62555ffa5a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371943

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I498cc41699ff2670aeaf7183d1f62e558c45a3e6
This commit is contained in:
Orion Hodson
2021-01-13 06:58:51 +00:00
committed by Automerger Merge Worker
parent 0968f0b55e 62555ffa5a
commit 02d9f55b5b
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/config/global.go
View File

@@ -215,10 +215,6 @@ func init() {
"frameworks/native/opengl/include", "frameworks/native/opengl/include",
"frameworks/av/include", "frameworks/av/include",
}) })
// 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_jni"})
pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase) pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string { pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {

10
cc/makevars.go
View File

@@ -154,16 +154,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("SOONG_STRIP_PATH", "${stripPath}") ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")
ctx.Strict("XZ", "${xzCmd}") ctx.Strict("XZ", "${xzCmd}")
nativeHelperIncludeFlags, err := ctx.Eval("${config.CommonNativehelperInclude}")
if err != nil {
panic(err)
}
nativeHelperIncludes, nativeHelperSystemIncludes := splitSystemIncludes(ctx, nativeHelperIncludeFlags)
if len(nativeHelperSystemIncludes) > 0 {
panic("native helper may not have any system includes")
}
ctx.Strict("JNI_H_INCLUDE", strings.Join(nativeHelperIncludes, " "))
includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}") includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}")
if err != nil { if err != nil {
panic(err) panic(err)