From 22e32f1b0ba4017e019dc0cbbb033edaad408f5a Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Mon, 18 Dec 2023 14:44:34 -0800 Subject: [PATCH] Properly package aconfig files for product and system_ext partitions Bug: 311173471 Test: Unit tests Change-Id: Iac60695beb6529139965e4bb24024df6ce278fb2 --- aconfig/aconfig_declarations.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go index 272ab038e..8cadd21c8 100644 --- a/aconfig/aconfig_declarations.go +++ b/aconfig/aconfig_declarations.go @@ -232,10 +232,16 @@ func mergeAconfigFiles(ctx android.ModuleContext, inputs android.Paths) android. } func SetAconfigFileMkEntries(m *android.ModuleBase, entries *android.AndroidMkEntries, aconfigFiles map[string]android.Paths) { - if m.InstallInVendor() { - entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles["vendor"]) - } else { - // TODO(b/311155208): The container here should be system. - entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[""]) + // TODO(b/311155208): The default container here should be system. + container := "" + + if m.SocSpecific() { + container = "vendor" + } else if m.ProductSpecific() { + container = "product" + } else if m.SystemExtSpecific() { + container = "system_ext" } + + entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[container]) }