diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 01:11:03 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 01:11:03 +0000 |
| commit | 17ccc647340c74531c9c6ef3e9defb89416d7951 (patch) | |
| tree | 4ff6434731886c36f5a6eef7606a7d31696542df /rules/android_library/impl.bzl | |
| parent | 7f7740c9ea674bf465c2afe0496065f7a6a0449e (diff) | |
| parent | 21b742bc1da1235309d33fdb4d20980e40eaef34 (diff) | |
| download | bazelbuild-rules_android-17ccc647340c74531c9c6ef3e9defb89416d7951.tar.gz | |
Snap for 8188146 from 21b742bc1da1235309d33fdb4d20980e40eaef34 to tm-frc-media-release
Change-Id: I5220047238ec55890009d8c01ba2b1471904a953
Diffstat (limited to 'rules/android_library/impl.bzl')
| -rw-r--r-- | rules/android_library/impl.bzl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl index 286d7b5..232899c 100644 --- a/rules/android_library/impl.bzl +++ b/rules/android_library/impl.bzl @@ -151,7 +151,7 @@ def _process_resources(ctx, java_package, **unused_ctxs): # misbehavior on the Java side. fix_resource_transitivity = bool(ctx.attr.srcs), fix_export_exporting = acls.in_fix_export_exporting_rollout(str(ctx.label)), - propagate_resources = not ctx.attr._android_test_migration, + android_test_migration = ctx.attr._android_test_migration, # Tool and Processing related inputs aapt = get_android_toolchain(ctx).aapt2.files_to_run, @@ -211,12 +211,11 @@ def _process_data_binding(ctx, java_package, resources_ctx, **unused_sub_ctxs): defines_resources = resources_ctx.defines_resources, enable_data_binding = ctx.attr.enable_data_binding, java_package = java_package, - layout_info = resources_ctx.data_binding_layout_info, deps = utils.collect_providers(DataBindingV2Info, ctx.attr.deps), 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[JavaPluginInfo], + get_android_toolchain(ctx).data_binding_annotation_processor[JavaInfo], data_binding_annotation_template = utils.only(get_android_toolchain(ctx).data_binding_annotation_template.files.to_list()), ), @@ -253,11 +252,11 @@ def _process_jvm(ctx, exceptions_ctx, resources_ctx, idl_ctx, db_ctx, **unused_s utils.collect_providers(JavaInfo, ctx.attr.deps, idl_ctx.idl_deps), exports = utils.collect_providers(JavaInfo, ctx.attr.exports), plugins = ( - utils.collect_providers(JavaPluginInfo, ctx.attr.plugins) + + utils.collect_providers(JavaInfo, ctx.attr.plugins) + db_ctx.java_plugins ), exported_plugins = utils.collect_providers( - JavaPluginInfo, + JavaInfo, ctx.attr.exported_plugins, ), annotation_processor_additional_outputs = ( @@ -340,9 +339,9 @@ def _process_native(ctx, idl_ctx, **unused_ctx): AndroidCcLinkParamsInfo( cc_common.merge_cc_infos( cc_infos = [ - info.cc_link_params_info + info.cc_info for info in utils.collect_providers( - JavaInfo, + JavaCcLinkParamsInfo, ctx.attr.deps, ctx.attr.exports, idl_ctx.idl_deps, @@ -432,9 +431,11 @@ def _make_legacy_provider(intellij_ctx, jvm_ctx, providers): android = _intellij.make_legacy_android_provider(intellij_ctx.android_ide_info), java = struct( annotation_processing = jvm_ctx.java_info.annotation_processing, + compilation_info = jvm_ctx.java_info.compilation_info, outputs = jvm_ctx.java_info.outputs, source_jars = depset(jvm_ctx.java_info.source_jars), transitive_deps = jvm_ctx.java_info.transitive_compile_time_jars, + transitive_exports = jvm_ctx.java_info.transitive_exports, transitive_runtime_deps = jvm_ctx.java_info.transitive_runtime_jars, transitive_source_jars = jvm_ctx.java_info.transitive_source_jars, ), @@ -499,7 +500,6 @@ def finalize( [ctx.outputs.lib_src_jar], transitive = [jvm_ctx.java_info.transitive_source_jars], ), - _direct_source_jars = depset([ctx.outputs.lib_src_jar]), _hidden_top_level_INTERNAL_ = depset( resources_ctx.validation_results, transitive = [ |