From 0d655a56dcb7108fb3c6e90d99ca9018f9c738b7 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Thu, 7 Oct 2021 13:58:04 +0000 Subject: Patch upstream JavaInfo->JavaPluginInfo change. This CL patches the java_plugin change in native Bazel code that removed JavaInfo, causing breakages as seen in b/202387866. This should probably be a change merged with commits from GitHub, so this is just a workaround until the upstream is ready. Fixes: 202387866 Test: b build //packages/apps/... Change-Id: Ib7f78ff146e1757c238ee11b8f2e65b7f787dc67 --- rules/android_library/impl.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl index cd7e2c0..286d7b5 100644 --- a/rules/android_library/impl.bzl +++ b/rules/android_library/impl.bzl @@ -216,7 +216,7 @@ def _process_data_binding(ctx, java_package, resources_ctx, **unused_sub_ctxs): exports = utils.collect_providers(DataBindingV2Info, ctx.attr.exports), data_binding_exec = get_android_toolchain(ctx).data_binding_exec.files_to_run, data_binding_annotation_processor = - get_android_toolchain(ctx).data_binding_annotation_processor[JavaInfo], + get_android_toolchain(ctx).data_binding_annotation_processor[JavaPluginInfo], data_binding_annotation_template = utils.only(get_android_toolchain(ctx).data_binding_annotation_template.files.to_list()), ), -- cgit v1.2.3