Revert "Cleanup old code"
This reverts commit 51ab5b6d506e58fe862623624938f72c76ac96eb.
Reason for revert: Revert while investigating b/349713034
Bug: 349713034
Change-Id: I4e0304225364c7c535a04108b65953a32742c1da
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go
index 86c1714..a47e80f 100644
--- a/android/aconfig_providers.go
+++ b/android/aconfig_providers.go
@@ -211,6 +211,7 @@
}
func getAconfigFilePaths(m *ModuleBase, aconfigFiles map[string]Paths) (paths Paths) {
+ // TODO(b/311155208): The default container here should be system.
container := "system"
if m.SocSpecific() {
@@ -222,5 +223,17 @@
}
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
}