Avoid crashing on proto_libraries when not incrementally dexing lite protos.
MOS_MIGRATED_REVID=147876411
@@ -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)
