Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef72cb7 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "bp2build: export CommonGlobalIncludes to @soong_injection." am: 4ca2ca54 

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

Change-Id: I8c41d9f3c79c26a1534213e3c66ead0a06720643
parents acc61696 4ca2ca54

cc/config/global.go

+13 −12
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ func init() { 


	// Everything in these lists is a crime against abstraction and dependency tracking.

	// Do not add anything to this list.

	pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I",

		[]string{

	commonGlobalIncludes := []string{

		"system/core/include",

		"system/logging/liblog/include",

		"system/media/audio/include",
@@ -236,7 +235,9 @@ func init() { 
		"frameworks/native/include",

		"frameworks/native/opengl/include",

		"frameworks/av/include",

		})

	}

	exportedVars.Set("CommonGlobalIncludes", commonGlobalIncludes)

	pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", commonGlobalIncludes)



	pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)

	pctx.VariableFunc("ClangBase", func(ctx android.PackageVarContext) string {