Add container property to aconfig_declarations.
Bug: 311155208
Test: Unit test
Change-Id: I7b187138856d0144203961e82b6dad5e2f8eed9d
diff --git a/cc/Android.bp b/cc/Android.bp
index 77e96db..06e0e5e 100644
--- a/cc/Android.bp
+++ b/cc/Android.bp
@@ -9,6 +9,7 @@
"blueprint",
"blueprint-pathtools",
"soong",
+ "soong-aconfig",
"soong-aidl-library",
"soong-android",
"soong-bazel",
diff --git a/cc/cc.go b/cc/cc.go
index e215438..d2518a1 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -30,6 +30,7 @@
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
+ "android/soong/aconfig"
"android/soong/aidl_library"
"android/soong/android"
"android/soong/bazel/cquery"
@@ -923,6 +924,9 @@
apexSdkVersion android.ApiLevel
hideApexVariantFromMake bool
+
+ // Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo
+ transitiveAconfigFiles map[string]*android.DepSet[android.Path]
}
func (c *Module) AddJSONData(d *map[string]interface{}) {
@@ -2335,6 +2339,8 @@
ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}
+ aconfig.CollectTransitiveAconfigFiles(ctx, &c.transitiveAconfigFiles)
+
c.maybeInstall(ctx, apexInfo)
}