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

Merge "Remove -isystem frameworks/av/include"

Browse Source
This commit is contained in:
Colin Cross
2017-05-04 04:09:42 +00:00
committed by Gerrit Code Review
parent bbc9f4d586 307d145ed5
commit 37a2aeb95a
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/compiler.go
View File

@@ -219,7 +219,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
if !(ctx.sdk() || ctx.vndk()) || ctx.Host() { if !(ctx.sdk() || ctx.vndk()) || ctx.Host() {
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags, flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
"${config.CommonGlobalIncludes}", "${config.CommonGlobalIncludes}",
"${config.CommonGlobalSystemIncludes}",
tc.IncludeFlags(), tc.IncludeFlags(),
"${config.CommonNativehelperInclude}") "${config.CommonNativehelperInclude}")
} }

3
cc/config/global.go
View File

@@ -112,9 +112,6 @@ func init() {
"libnativehelper/include", "libnativehelper/include",
"frameworks/native/include", "frameworks/native/include",
"frameworks/native/opengl/include", "frameworks/native/opengl/include",
})
pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
[]string{
"frameworks/av/include", "frameworks/av/include",
}) })
// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help // This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help

2
cc/makevars.go
View File

@@ -77,7 +77,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("AIDL_CPP", "${aidlCmd}") ctx.Strict("AIDL_CPP", "${aidlCmd}")
includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes} ${config.CommonGlobalSystemIncludes}") includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}")
if err != nil { if err != nil {
panic(err) panic(err)
} }