StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move CollectDependencyAconfigFiles to android

Browse Source 
This needs to be called by some modules in android.

Bug: 308625757
Test: manual
Change-Id: I389fcfd88a3f4bd85a9218fdd4dd66d8a239bb67
This commit is contained in:
LaMont Jones
2023-12-19 19:01:57 +00:00
parent 349ef87505
commit aa005ae080
15 changed files with 106 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/cc.go
View File

@@ -28,7 +28,6 @@ import (
"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 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
}
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)
}