summaryrefslogtreecommitdiff
path: root/aconfig
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-01-21 11:25:47 -0800
committer Cole Faust <colefaust@google.com> 2025-01-21 11:25:47 -0800
commita0eea4fc5e44507e09a7f086ca5edc26eb00e40a (patch)
tree76f90a229336f9eaf84105ec8193972e3dad9c7d /aconfig
parentfe6a78178a2d718352a1160ba67e78b344aa3a82 (diff)
Make api_files configurable
For ag/31382653. Bug: 391174731 Test: m nothing --no-skip-soong-tests Change-Id: Ie51a6e943fafbd39fa761af3682d003bdb1ddebd
Diffstat (limited to 'aconfig')
-rw-r--r--aconfig/all_aconfig_declarations.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go
index bb906077a..9086c9306 100644
--- a/aconfig/all_aconfig_declarations.go
+++ b/aconfig/all_aconfig_declarations.go
@@ -19,6 +19,8 @@ import (
"slices"
"android/soong/android"
+
+ "github.com/google/blueprint/proptools"
)
// A singleton module that collects all of the aconfig flags declared in the
@@ -41,7 +43,7 @@ type allAconfigReleaseDeclarationsSingleton struct {
}
type allAconfigReleaseDeclarationsProperties struct {
- Api_files []string `android:"arch_variant,path"`
+ Api_files proptools.Configurable[[]string] `android:"arch_variant,path"`
}
type allAconfigDeclarationsSingleton struct {
@@ -62,7 +64,7 @@ func (this *allAconfigDeclarationsSingleton) sortedConfigNames() []string {
func (this *allAconfigDeclarationsSingleton) GenerateAndroidBuildActions(ctx android.ModuleContext) {
apiFiles := android.Paths{}
- for _, apiFile := range this.properties.Api_files {
+ for _, apiFile := range this.properties.Api_files.GetOrDefault(ctx, nil) {
if path := android.PathForModuleSrc(ctx, apiFile); path != nil {
apiFiles = append(apiFiles, path)
}