From 0c97185450af31897bec2f0362125edcf9b816ce Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamontjones@google.com>
Date: Thu, 7 Dec 2023 21:56:59 +0000
Subject: rust: add aconfig_flag support

Bug: b/308625757
Test: manual
Change-Id: Ifd98cd0ad4e2525b08f5766e9332991c049162ea
---
 rust/rust.go | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'rust/rust.go')

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 {
-- 
cgit v1.2.3-59-g8ed1b