summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-11-21 00:48:34 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-11-21 00:48:34 +0000
commit81e45629c3556cd9797777550af78139effd1502 (patch)
tree19ff606de22664ab9ab167fb208dbd8ce7775bba /java/java.go
parente00f2462ca76d15cabb7f43e7bb01c14688ce10c (diff)
parent458fde5f93d5127ea2cd82814f1178f9f678ba6b (diff)
Merge "Collect aconfig files from *_libs in java_api_library" into main
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index 64ef782f5..260d33610 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2311,14 +2311,17 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
case libTag:
if provider, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok {
classPaths = append(classPaths, provider.HeaderJars...)
+ al.aconfigProtoFiles = append(al.aconfigProtoFiles, provider.AconfigIntermediateCacheOutputPaths...)
}
case bootClasspathTag:
if provider, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok {
bootclassPaths = append(bootclassPaths, provider.HeaderJars...)
+ al.aconfigProtoFiles = append(al.aconfigProtoFiles, provider.AconfigIntermediateCacheOutputPaths...)
}
case staticLibTag:
if provider, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok {
staticLibs = append(staticLibs, provider.HeaderJars...)
+ al.aconfigProtoFiles = append(al.aconfigProtoFiles, provider.AconfigIntermediateCacheOutputPaths...)
}
case systemModulesTag:
if sm, ok := android.OtherModuleProvider(ctx, dep, SystemModulesProvider); ok {