Merge "bp2build: export CommonGlobalIncludes to @soong_injection."

This commit is contained in:
Jingwen Chen
2021-05-19 10:21:41 +00:00
committed by Gerrit Code Review

View File

@@ -225,18 +225,19 @@ func init() {
// Everything in these lists 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.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", commonGlobalIncludes := []string{
[]string{ "system/core/include",
"system/core/include", "system/logging/liblog/include",
"system/logging/liblog/include", "system/media/audio/include",
"system/media/audio/include", "hardware/libhardware/include",
"hardware/libhardware/include", "hardware/libhardware_legacy/include",
"hardware/libhardware_legacy/include", "hardware/ril/include",
"hardware/ril/include", "frameworks/native/include",
"frameworks/native/include", "frameworks/native/opengl/include",
"frameworks/native/opengl/include", "frameworks/av/include",
"frameworks/av/include", }
}) exportedVars.Set("CommonGlobalIncludes", commonGlobalIncludes)
pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", commonGlobalIncludes)
pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase) pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string { pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {