Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main

2 files changed, 6 insertions, 0 deletions

diff --git a/cc/androidmk.go b/cc/androidmk.go
index ed13e5e99..224ea9623 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -133,6 +133,8 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
 					entries.SetString("SOONG_SDK_VARIANT_MODULES",
 						"$(SOONG_SDK_VARIANT_MODULES) $(patsubst %.sdk,%,$(LOCAL_MODULE))")
 				}
+				// TODO(b/311155208): The container here should be system.
+				entries.SetOptionalPaths("LOCAL_ACONFIG_FILES", c.getTransitiveAconfigFiles(""))
 			},
 		},
 		ExtraFooters: []android.AndroidMkExtraFootersFunc{
diff --git a/cc/cc.go b/cc/cc.go
index 3fc93bd69..5d4ceb81d 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2345,6 +2345,10 @@ func (c *Module) maybeUnhideFromMake() {
 	}
 }
 
+func (c *Module) getTransitiveAconfigFiles(container string) []android.Path {
+	return c.transitiveAconfigFiles[container].ToList()
+}
+
 // maybeInstall is called at the end of both GenerateAndroidBuildActions and
 // ProcessBazelQueryResponse to run the install hooks for installable modules,
 // like binaries and tests.