diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java index 3d6ac89a1e..4c8e400cd9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryMobileInstall.java @@ -364,7 +364,8 @@ public final class AndroidBinaryMobileInstall { JavaTargetAttributes attributes = new JavaTargetAttributes.Builder(javaSemantics) - .addRuntimeClassPathEntries(provider.getRuntimeJars()) + // TODO(b/78520435): why is this using non-transitive runtime jars? + .addRuntimeClassPathEntries(provider.getJavaCompilationArgs().getRuntimeJars()) .build(); Function<Artifact, Artifact> desugaredJars = Functions.identity(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java index 8091451db7..296ce6dc46 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java @@ -274,7 +274,7 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu WrappingProvider.Helper.getWrappedProvider( base, JavaProtoLibraryAspectProvider.class, JavaCompilationArgsProvider.class); if (javaCompilationArgsProvider != null) { - return javaCompilationArgsProvider.getRuntimeJars(); + return javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars(); } } } else { |