diff options
| author | 2023-12-19 19:01:57 +0000 | |
|---|---|---|
| committer | 2023-12-19 19:34:00 +0000 | |
| commit | aa005ae080b4837c42ff8174ee8300f0dff9628e (patch) | |
| tree | b6ab2c15fd7ea7199e563b5d3dc0c274b4ef7466 /java | |
| parent | 349ef8750509e0eb3fb026df2e481f970652b069 (diff) | |
move CollectDependencyAconfigFiles to android
This needs to be called by some modules in android.
Bug: 308625757
Test: manual
Change-Id: I389fcfd88a3f4bd85a9218fdd4dd66d8a239bb67
Diffstat (limited to 'java')
| -rwxr-xr-x | java/app.go | 3 | ||||
| -rw-r--r-- | java/base.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/app.go b/java/app.go index 7f0303a6b..8b28dac78 100755 --- a/java/app.go +++ b/java/app.go @@ -22,7 +22,6 @@ import ( "path/filepath" "strings" - "android/soong/aconfig" "android/soong/testing" "github.com/google/blueprint" @@ -509,7 +508,7 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { var aconfigTextFilePaths android.Paths ctx.VisitDirectDepsWithTag(aconfigDeclarationTag, func(dep android.Module) { - if provider, ok := android.OtherModuleProvider(ctx, dep, aconfig.DeclarationsProviderKey); ok { + if provider, ok := android.OtherModuleProvider(ctx, dep, android.AconfigDeclarationsProviderKey); ok { aconfigTextFilePaths = append(aconfigTextFilePaths, provider.IntermediateDumpOutputPath) } else { ctx.ModuleErrorf("Only aconfig_declarations module type is allowed for "+ diff --git a/java/base.go b/java/base.go index 41f2fcc96..0d3e4dbe3 100644 --- a/java/base.go +++ b/java/base.go @@ -24,7 +24,6 @@ import ( "github.com/google/blueprint/pathtools" "github.com/google/blueprint/proptools" - "android/soong/aconfig" "android/soong/android" "android/soong/dexpreopt" "android/soong/java/config" @@ -1694,7 +1693,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath ctx.CheckbuildFile(outputFile) - aconfig.CollectDependencyAconfigFiles(ctx, &j.mergedAconfigFiles) + android.CollectDependencyAconfigFiles(ctx, &j.mergedAconfigFiles) android.SetProvider(ctx, JavaInfoProvider, JavaInfo{ HeaderJars: android.PathsIfNonNil(j.headerJarFile), |