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

Merge "Properly package aconfig files for product and system_ext partitions" into main

Browse source
This commit is contained in:
Yu Liu 2023-12-19 00:40:03 +00:00 committed by Gerrit Code Review
commit 4c27146e4c
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aconfig/aconfig_declarations.go
View file

@ -229,10 +229,16 @@ func mergeAconfigFiles(ctx android.ModuleContext, inputs android.Paths) android.
} }
func SetAconfigFileMkEntries(m *android.ModuleBase, entries *android.AndroidMkEntries, aconfigFiles map[string]android.Paths) { func SetAconfigFileMkEntries(m *android.ModuleBase, entries *android.AndroidMkEntries, aconfigFiles map[string]android.Paths) {
if m.InstallInVendor() { // TODO(b/311155208): The default container here should be system.
entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles["vendor"]) container := ""
} else {
// TODO(b/311155208): The container here should be system. if m.SocSpecific() {
entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[""]) container = "vendor"
} else if m.ProductSpecific() {
container = "product"
} else if m.SystemExtSpecific() {
container = "system_ext"
} }
entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[container])
} }