tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main

Browse source
This commit is contained in:
LaMont Jones 2023-12-06 18:01:17 +00:00 committed by Gerrit Code Review
commit 7dcbf427f9
2 changed files with 6 additions and 0 deletions
Show stats 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.