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

Merge "Properly package aconfig files for product and system_ext partitions" into main am: 4c27146e4c am: 1c6b1fb260

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880492

Change-Id: I33f8b518186a8aaf7f816d9289636a23c9dcb23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2023-12-19 01:56:59 +00:00
committed by Automerger Merge Worker
parent 503d8ef094 1c6b1fb260
commit c54dd4848e
1 changed files with 11 additions and 5 deletions
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])
} }