Remove duplicated CollectDependencyAconfigFiles() am: 40182b6ff3 am: 6928bcfa4a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074027

Change-Id: I03e902b51aa19cb89b651cc580ccebf27a705707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Yun
2024-05-10 07:16:35 +00:00
committed by Automerger Merge Worker
18 changed files with 13 additions and 163 deletions

View File

@@ -106,9 +106,6 @@ type Droidstubs struct {
everythingArtifacts stubsArtifacts
exportableArtifacts stubsArtifacts
// Single aconfig "cache file" merged from this module and all dependencies.
mergedAconfigFiles map[string]android.Paths
exportableApiFile android.WritablePath
exportableRemovedApiFile android.WritablePath
}
@@ -1343,7 +1340,6 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) {
rule.Build("nullabilityWarningsCheck", "nullability warnings check")
}
android.CollectDependencyAconfigFiles(ctx, &d.mergedAconfigFiles)
}
func (d *Droidstubs) createApiContribution(ctx android.DefaultableHookContext) {