diff options
| author |  Googler <noreply@google.com> | 2017-02-17 21:59:27 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-02-20 09:43:01 +0000 |
| commit | 36cfe352c1e5d3a1c0cee9f2ea1427547ce487af (patch) | |
| tree | cec45140eb51979652845faab67565f0c82c3e96 /src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | |
| parent | 695aeb7493dc0b5ed286e81453a2a9a1364e8322 (diff) | |
Avoid crashing on proto_libraries when not incrementally dexing lite protos.
--
PiperOrigin-RevId: 147876411
MOS_MIGRATED_REVID=147876411
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | 5 |
1 files changed, 2 insertions, 3 deletions
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 5ffd0fa70a..df64a5b6ab 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 @@ -217,15 +217,14 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu } AndroidRuntimeJarProvider.Builder desugaredJars = new AndroidRuntimeJarProvider.Builder() .addTransitiveProviders(collectPrerequisites(ruleContext, AndroidRuntimeJarProvider.class)); - if (isProtoLibrary(ruleContext) - && getAndroidConfig(ruleContext).incrementalDexingForLiteProtos()) { + if (isProtoLibrary(ruleContext)) { // TODO(b/33557068): Desugar protos if needed instead of assuming they don't need desugaring result.addProvider(desugaredJars.build()); return Functions.identity(); } JavaRuntimeJarProvider jarProvider = base.getProvider(JavaRuntimeJarProvider.class); - if (jarProvider != null && !isProtoLibrary(ruleContext)) { + if (jarProvider != null) { // These are all transitive hjars of dependencies and hjar of the jar itself NestedSet<Artifact> compileTimeClasspath = getJavaCompilationArgsProvider(base, ruleContext) |