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

Revert "Cleanup old code"

Browse Source 
This reverts commit 51ab5b6d50.

Reason for revert: Revert while investigating b/349713034

Bug: 349713034
Change-Id: I4e0304225364c7c535a04108b65953a32742c1da
This commit is contained in:
LaMont Jones
2024-06-28 14:30:59 +00:00
parent 51ab5b6d50
commit d4a6cc6d52
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/aconfig_providers.go
View File

@@ -211,6 +211,7 @@ func mergeAconfigFiles(ctx ModuleContext, container string, inputs Paths, genera
} }
func getAconfigFilePaths(m *ModuleBase, aconfigFiles map[string]Paths) (paths Paths) { func getAconfigFilePaths(m *ModuleBase, aconfigFiles map[string]Paths) (paths Paths) {
// TODO(b/311155208): The default container here should be system.
container := "system" container := "system"
if m.SocSpecific() { if m.SocSpecific() {
@@ -222,5 +223,17 @@ func getAconfigFilePaths(m *ModuleBase, aconfigFiles map[string]Paths) (paths Pa
} }
paths = append(paths, aconfigFiles[container]...) paths = append(paths, aconfigFiles[container]...)
if container == "system" {
// TODO(b/311155208): Once the default container is system, we can drop this.
paths = append(paths, aconfigFiles[""]...)
}
if container != "system" {
if len(aconfigFiles[container]) == 0 && len(aconfigFiles[""]) > 0 {
// TODO(b/308625757): Either we guessed the container wrong, or the flag is misdeclared.
// For now, just include the system (aka "") container if we get here.
//fmt.Printf("container_mismatch: module=%v container=%v files=%v\n", m, container, aconfigFiles)
}
paths = append(paths, aconfigFiles[""]...)
}
return return
} }