summaryrefslogtreecommitdiff
path: root/rust/rust.go
diff options
context:
space:
mode:
author LaMont Jones <lamontjones@google.com> 2023-12-07 21:56:59 +0000
committer LaMont Jones <lamontjones@google.com> 2023-12-07 21:56:59 +0000
commit0c97185450af31897bec2f0362125edcf9b816ce (patch)
tree48cd3c09bf5d0d76e2193263fb0d495cb55c1664 /rust/rust.go
parentd788b3e6cb8753ea3460bd2cb462aff27a966aef (diff)
rust: add aconfig_flag support
Bug: b/308625757 Test: manual Change-Id: Ifd98cd0ad4e2525b08f5766e9332991c049162ea
Diffstat (limited to 'rust/rust.go')
-rw-r--r--rust/rust.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/rust/rust.go b/rust/rust.go
index 3d51a1373..ddebb7599 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -26,6 +26,7 @@ import (
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
+ "android/soong/aconfig"
"android/soong/android"
"android/soong/cc"
cc_config "android/soong/cc/config"
@@ -176,6 +177,9 @@ type Module struct {
transitiveAndroidMkSharedLibs *android.DepSet[string]
android.BazelModuleBase
+
+ // Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo
+ mergedAconfigFiles map[string]android.Paths
}
func (mod *Module) Header() bool {
@@ -1006,6 +1010,8 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
if mod.testModule {
ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}
+
+ aconfig.CollectDependencyAconfigFiles(ctx, &mod.mergedAconfigFiles)
}
func (mod *Module) deps(ctx DepsContext) Deps {