commit aa005ae080b4837c42ff8174ee8300f0dff9628e
author LaMont Jones <lamontjones@google.com> Tue Dec 19 19:01:57 2023 +0000
committer LaMont Jones <lamontjones@google.com> Tue Dec 19 19:34:00 2023 +0000
tree b6ab2c15fd7ea7199e563b5d3dc0c274b4ef7466
parent 349ef8750509e0eb3fb026df2e481f970652b069

move CollectDependencyAconfigFiles to android

This needs to be called by some modules in android.

Bug: 308625757
Test: manual
Change-Id: I389fcfd88a3f4bd85a9218fdd4dd66d8a239bb67

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index e6b9d8b..9f32c44 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -28,7 +28,6 @@
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 
-	"android/soong/aconfig"
 	"android/soong/aidl_library"
 	"android/soong/android"
 	"android/soong/cc/config"
@@ -2137,7 +2136,7 @@
 	}
 	android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: deps.GeneratedSources.Strings()})
 
-	aconfig.CollectDependencyAconfigFiles(ctx, &c.mergedAconfigFiles)
+	android.CollectDependencyAconfigFiles(ctx, &c.mergedAconfigFiles)
 
 	c.maybeInstall(ctx, apexInfo)
 }