diff options
| author | 2025-01-10 00:34:06 +0000 | |
|---|---|---|
| committer | 2025-01-10 00:54:49 +0000 | |
| commit | 460cf3783713a82c0f8c41d97c76f3e92451f3e6 (patch) | |
| tree | 126a3633cb976e876b84d1623db569a98614cd97 /java/app.go | |
| parent | fc8d5c13f7764f1094a37b2a99ffdf7c813387df (diff) | |
Convert hasCode and aaptLibs to use ModuleProxy.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Ie937a236f3c286fb5b2cd439614f09f7a85e884f
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/app.go b/java/app.go index 0abeaf486..12705b0a5 100644 --- a/java/app.go +++ b/java/app.go @@ -575,7 +575,7 @@ func (a *AndroidApp) renameResourcesPackage() bool { } func getAconfigFilePaths(ctx android.ModuleContext) (aconfigTextFilePaths android.Paths) { - ctx.VisitDirectDeps(func(dep android.Module) { + ctx.VisitDirectDepsProxy(func(dep android.ModuleProxy) { tag := ctx.OtherModuleDependencyTag(dep) switch tag { case staticLibTag: @@ -730,6 +730,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) (android.Path, a var packageResources = a.exportPackage + javaInfo := &JavaInfo{} if ctx.ModuleName() != "framework-res" { if a.dexProperties.resourceShrinkingEnabled(ctx) { protoFile := android.PathForModuleOut(ctx, packageResources.Base()+".proto.apk") @@ -753,13 +754,17 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) (android.Path, a extraSrcJars = android.Paths{a.aapt.aaptSrcJar} } - a.Module.compile(ctx, extraSrcJars, extraClasspathJars, extraCombinedJars, nil) + javaInfo = a.Module.compile(ctx, extraSrcJars, extraClasspathJars, extraCombinedJars, nil) if a.dexProperties.resourceShrinkingEnabled(ctx) { binaryResources := android.PathForModuleOut(ctx, packageResources.Base()+".binary.out.apk") aapt2Convert(ctx, binaryResources, a.dexer.resourcesOutput.Path(), "binary") packageResources = binaryResources } } + if javaInfo != nil { + setExtraJavaInfo(ctx, a, javaInfo) + android.SetProvider(ctx, JavaInfoProvider, javaInfo) + } return a.dexJarFile.PathOrNil(), packageResources } |