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

Split CommonGlobalIncludes for system includes

Browse Source 
am: 1cfd89aca3

Change-Id: If983beb6b00b0e6348f838ad2a44616a4711cd63
This commit is contained in:
Colin Cross
2016-09-15 18:17:50 +00:00
committed by android-build-merger
parent 565fc67ac9 1cfd89aca3
commit 74a8c40cca
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/compiler.go
View File

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

6
cc/config/global.go
View File

@@ -90,9 +90,11 @@ func init() {
pctx.StaticVariable("CommonClangGlobalCppflags", pctx.StaticVariable("CommonClangGlobalCppflags",
strings.Join(append(ClangFilterUnknownCflags(commonGlobalCppflags), "${ClangExtraCppflags}"), " ")) strings.Join(append(ClangFilterUnknownCflags(commonGlobalCppflags), "${ClangExtraCppflags}"), " "))
// Everything in this list is a crime against abstraction and dependency tracking. // Everything in these lists is a crime against abstraction and dependency tracking.
// Do not add anything to this list. // Do not add anything to this list.
pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-isystem ", pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-I",
[]string{})
pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
[]string{ []string{
"system/core/include", "system/core/include",
"system/media/audio/include", "system/media/audio/include",

2
cc/makevars.go
View File

@@ -44,7 +44,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE", "") ctx.Strict("GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE", "")
ctx.Strict("NDK_PREBUILT_SHARED_LIBRARIES", strings.Join(ndkPrebuiltSharedLibs, " ")) ctx.Strict("NDK_PREBUILT_SHARED_LIBRARIES", strings.Join(ndkPrebuiltSharedLibs, " "))
includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}") includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes} ${config.CommonGlobalSystemIncludes}")
if err != nil { if err != nil {
panic(err) panic(err)
} }