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

Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9

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

Change-Id: Ibe4edfa6bd523d8f4d7850e7935a435734c2c2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
LaMont Jones
2023-12-06 19:16:59 +00:00
committed by Automerger Merge Worker
parent 3f2cdb2665 7dcbf427f9
commit 78c3daf391
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/androidmk.go
View File

@@ -133,6 +133,8 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
entries.SetString("SOONG_SDK_VARIANT_MODULES",
"$(SOONG_SDK_VARIANT_MODULES) $(patsubst %.sdk,%,$(LOCAL_MODULE))")
}
// TODO(b/311155208): The container here should be system.
entries.SetOptionalPaths("LOCAL_ACONFIG_FILES", c.getTransitiveAconfigFiles(""))
},
},
ExtraFooters: []android.AndroidMkExtraFootersFunc{

4
cc/cc.go
View File

@@ -2345,6 +2345,10 @@ func (c *Module) maybeUnhideFromMake() {
}
}
func (c *Module) getTransitiveAconfigFiles(container string) []android.Path {
return c.transitiveAconfigFiles[container].ToList()
}
// maybeInstall is called at the end of both GenerateAndroidBuildActions and
// ProcessBazelQueryResponse to run the install hooks for installable modules,
// like binaries and tests.