diff options
| author | 2023-12-08 19:35:28 +0000 | |
|---|---|---|
| committer | 2023-12-08 19:35:28 +0000 | |
| commit | 5ada6c273867643cfdafb9f522f941892837fb10 (patch) | |
| tree | 5eb61a945b1bebcdfda975a15d9de2091526dad6 /rust/rust.go | |
| parent | 2237d24894fd461e4facd48dedd6a8802eb3e8ff (diff) | |
| parent | 0c97185450af31897bec2f0362125edcf9b816ce (diff) | |
Merge "rust: add aconfig_flag support" into main
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 6 |
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 { |