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

Track transitive usage of aconfig flags and add LOCAL_ACONFIG_FILES to Android-<product>.mk

Browse Source 
Bug: 283910439
Test: m nothing (runs soong tests)
Change-Id: I59f9bef7b7c502565d531a5685c002a177e0a77c
This commit is contained in:
Joe Onorato
2023-07-16 13:20:33 -07:00
parent cfcd0a4960
commit 6fe59eb7f0
10 changed files with 234 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
java/base.go
View File

@@ -508,6 +508,14 @@ type Module struct {
// This should be set in every ModuleWithStem's GenerateAndroidBuildActions
// or the module should override Stem().
stem string
// Aconfig "cache files" that went directly into this module. Transitive ones are
// tracked via JavaInfo.TransitiveAconfigFiles
// TODO: Extract to something standalone to propagate tags via GeneratedJavaLibraryModule
aconfigIntermediates android.Paths
// Aconfig files for all transitive deps. Also exposed via JavaInfo
transitiveAconfigFiles *android.DepSet[android.Path]
}
func (j *Module) CheckStableSdkVersion(ctx android.BaseModuleContext) error {
@@ -1623,6 +1631,8 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
ctx.CheckbuildFile(outputFile)
j.collectTransitiveAconfigFiles(ctx)
ctx.SetProvider(JavaInfoProvider, JavaInfo{
HeaderJars: android.PathsIfNonNil(j.headerJarFile),
TransitiveLibsHeaderJars: j.transitiveLibsHeaderJars,
@@ -1637,6 +1647,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
ExportedPluginClasses: j.exportedPluginClasses,
ExportedPluginDisableTurbine: j.exportedDisableTurbine,
JacocoReportClassesFile: j.jacocoReportClassesFile,
TransitiveAconfigFiles: j.transitiveAconfigFiles,
})
// Save the output file with no relative path so that it doesn't end up in a subdirectory when used as a resource
@@ -1917,6 +1928,34 @@ func (j *Module) IsInstallable() bool {
return Bool(j.properties.Installable)
}
func (j *Module) collectTransitiveAconfigFiles(ctx android.ModuleContext) {
// Aconfig files from this module
mine := j.aconfigIntermediates
// Aconfig files from transitive dependencies
fromDeps := []*android.DepSet[android.Path]{}
ctx.VisitDirectDeps(func(module android.Module) {
dep := ctx.OtherModuleProvider(module, JavaInfoProvider).(JavaInfo)
if dep.TransitiveAconfigFiles != nil {
fromDeps = append(fromDeps, dep.TransitiveAconfigFiles)
}
})
// DepSet containing aconfig files myself and from dependencies
j.transitiveAconfigFiles = android.NewDepSet(android.POSTORDER, mine, fromDeps)
}
func (j *Module) AddAconfigIntermediate(path android.Path) {
j.aconfigIntermediates = append(j.aconfigIntermediates, path)
}
func (j *Module) getTransitiveAconfigFiles() *android.DepSet[android.Path] {
if j.transitiveAconfigFiles == nil {
panic(fmt.Errorf("java.Moduile: getTransitiveAconfigFiles called before collectTransitiveAconfigFiles module=%s", j.Name()))
}
return j.transitiveAconfigFiles
}
type sdkLinkType int
const (