Prefer the primary target platform when deduplicating Android splits. PiperOrigin-RevId: 1014217205 Change-Id: Iadda5309d75a69d1e44599de5c33b1f8240d1d0a
diff --git a/rules/android_application/android_feature_module_rule.bzl b/rules/android_application/android_feature_module_rule.bzl index 8421168..0a70728 100644 --- a/rules/android_application/android_feature_module_rule.bzl +++ b/rules/android_application/android_feature_module_rule.bzl
@@ -45,7 +45,7 @@ else: args.add("") args.add(ctx.attr.binary[ApkInfo].unsigned_apk.path) - args.add(utils.dedupe_split_attr(ctx.split_attr.library).label) + args.add(utils.get_primary_split(ctx, "library").label) args.add(get_android_toolchain(ctx).xmllint_tool.files_to_run.executable) args.add(get_android_toolchain(ctx).unzip_tool.files_to_run.executable) args.add(ctx.attr.is_asset_pack) @@ -67,7 +67,7 @@ return [ AndroidFeatureModuleInfo( binary = ctx.attr.binary, - library = utils.dedupe_split_attr(ctx.split_attr.library), + library = utils.get_primary_split(ctx, "library"), title_id = ctx.attr.title_id, title_lib = ctx.attr.title_lib, feature_name = ctx.attr.feature_name,
diff --git a/rules/android_binary/impl.bzl b/rules/android_binary/impl.bzl index 3752a04..a339148 100644 --- a/rules/android_binary/impl.bzl +++ b/rules/android_binary/impl.bzl
@@ -111,7 +111,7 @@ should_throw_on_conflict = not acls.in_allow_resource_conflicts(str(ctx.label)), enable_data_binding = ctx.attr.enable_data_binding, enable_manifest_merging = ctx.attr._enable_manifest_merging, - deps = utils.dedupe_split_attr(ctx.split_attr.deps), + deps = utils.get_primary_split(ctx, "deps"), resource_apks = resource_apks, instruments = ctx.attr.instruments, build_java_with_final_resources = acls.in_force_final_android_binary_resources(str(ctx.label)), @@ -198,7 +198,7 @@ java_package = java_package, layout_info = packaged_resources_ctx.data_binding_layout_info, artifact_type = "APPLICATION", - deps = utils.collect_providers(DataBindingV2Info, utils.dedupe_split_attr(ctx.split_attr.deps)), + deps = utils.collect_providers(DataBindingV2Info, utils.get_primary_split(ctx, "deps")), 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], @@ -218,7 +218,7 @@ javac_opts = ctx.attr.javacopts + db_ctx.javac_opts, r_java = packaged_resources_ctx.r_java, enable_deps_without_srcs = True, - deps = utils.collect_providers(JavaInfo, utils.dedupe_split_attr(ctx.split_attr.deps) + stamp_ctx.deps), + deps = utils.collect_providers(JavaInfo, utils.get_primary_split(ctx, "deps") + stamp_ctx.deps), plugins = utils.collect_providers(JavaPluginInfo, ctx.attr.plugins) + db_ctx.java_plugins, @@ -484,7 +484,10 @@ # resource JARs. # TODO(b/69552500): Instead, handle this properly so R JARs aren't put on the classpath # for both binaries and libraries. - library_r_jar_dict = {jar: True for jar in _get_library_r_jars(ctx.attr.deps)} + library_r_jar_dict = { + jar: True + for jar in _get_library_r_jars(utils.get_primary_split(ctx, "deps")) + } transitive_runtime_jars_for_archive = [jar for jar in java_info.transitive_runtime_jars.to_list() if jar not in library_r_jar_dict] for jar in transitive_runtime_jars_for_archive: desugared_jars.append(desugar_dict.get(jar, jar)) @@ -580,7 +583,7 @@ ] if deploy_ctx.one_version_enforcement_output else [], transitive = [info["_hidden_top_level_INTERNAL_"] for info in utils.collect_providers( OutputGroupInfo, - utils.dedupe_split_attr(ctx.split_attr.deps), + utils.get_primary_split(ctx, "deps"), )], ) providers.extend( @@ -647,7 +650,7 @@ profile_provider.files for profile_provider in utils.collect_providers( BaselineProfileProvider, - ctx.attr.deps, + utils.get_primary_split(ctx, "deps"), ) ], ) @@ -1003,7 +1006,10 @@ ) def _process_idl(ctx, **_unused_ctxs): - deps = utils.collect_providers(AndroidIdlInfo, ctx.attr.deps) + deps = utils.collect_providers( + AndroidIdlInfo, + utils.get_primary_split(ctx, "deps"), + ) android_idl_info = AndroidIdlInfo( transitive_idl_import_roots = depset(
diff --git a/rules/android_binary/r8.bzl b/rules/android_binary/r8.bzl index 5d1f6e4..2ec580a 100644 --- a/rules/android_binary/r8.bzl +++ b/rules/android_binary/r8.bzl
@@ -117,7 +117,10 @@ else: fail("minSdkVersion must be an integer") - neverlink_infos = utils.collect_providers(StarlarkAndroidNeverlinkInfo, ctx.attr.deps) + neverlink_infos = utils.collect_providers( + StarlarkAndroidNeverlinkInfo, + utils.get_primary_split(ctx, "deps"), + ) neverlink_jars = depset(transitive = [info.transitive_neverlink_libraries for info in neverlink_infos]) args = ctx.actions.args()
diff --git a/rules/dex_desugar_aspect.bzl b/rules/dex_desugar_aspect.bzl index 406262a..bc15881 100644 --- a/rules/dex_desugar_aspect.bzl +++ b/rules/dex_desugar_aspect.bzl
@@ -56,18 +56,10 @@ """ deps_list = [] for attr in _ATTR_ASPECTS: - # android_binary's deps attr has a split transition, so when - # this is called from android_binary, deps should be accessed - # via ctx.split_attr instead of ctx.attr to ensure that the same - # branch of the split is used throughout the build. An aspect's - # ctx doesn't have split_attr, so access that via ctx.attr when - # this is called from the aspect impl. - if attr == "deps" and hasattr(ctx, "split_attr"): - deps = _utils.dedupe_split_attr(ctx.split_attr.deps) - elif attr == "_toolchain" and getattr(ctx, "kind", "") == "kt_jvm_toolchain": + if attr == "_toolchain" and getattr(ctx, "kind", "") == "kt_jvm_toolchain": pass # TODO(b/370300302): Prevent double-deps on Kotlin toolchain. Delete when fixed. else: - deps = getattr(ctx.attr, attr, []) + deps = _utils.get_primary_split(ctx, attr) if str(type(deps)) == "list": deps_list += deps
diff --git a/rules/proguard.bzl b/rules/proguard.bzl index 17a717d..0fca777 100644 --- a/rules/proguard.bzl +++ b/rules/proguard.bzl
@@ -125,7 +125,7 @@ ctx, resource_proguard_config, proguard_specs_for_manifest = []): - proguard_deps = utils.collect_providers(ProguardSpecInfo, utils.dedupe_split_attr(ctx.split_attr.deps)) + proguard_deps = utils.collect_providers(ProguardSpecInfo, utils.get_primary_split(ctx, "deps")) if ctx.configuration.coverage_enabled and hasattr(ctx.attr, "_jacoco_runtime"): proguard_deps.append(ctx.attr._jacoco_runtime[ProguardSpecInfo]) @@ -458,7 +458,8 @@ library_jar_list = [utils.only(common.get_java_toolchain(ctx)[java_common.JavaToolchainInfo].bootclasspath.to_list())] if read_possibly_native_flag(ctx, "desugar_for_android"): library_jar_list.append(ctx.file._desugared_java8_legacy_apis) - neverlink_infos = utils.collect_providers(StarlarkAndroidNeverlinkInfo, ctx.attr.deps) + deps = utils.get_primary_split(ctx, "deps") + neverlink_infos = utils.collect_providers(StarlarkAndroidNeverlinkInfo, deps) library_jars = depset(library_jar_list, transitive = [info.transitive_neverlink_libraries for info in neverlink_infos]) optimize_resources = bool(resource_shrinker_log)
diff --git a/rules/utils.bzl b/rules/utils.bzl index f950b6a..d0e705e 100644 --- a/rules/utils.bzl +++ b/rules/utils.bzl
@@ -291,11 +291,21 @@ res[k] = _expand_var(ctx.var, v) return res -def _dedupe_split_attr(attr): - if not attr: - return [] - arch = _first(sorted(attr.keys())) - return attr[arch] +def _get_primary_split(ctx, attr_name, default = []): + """Returns attr_name from the primary (android_platforms[0]) split. + + Falls back to ctx.attr.<attr_name> if the attr isn't split (e.g. in aspects). + """ + split_attr = getattr(ctx, "split_attr", None) + split = getattr(split_attr, attr_name, None) if split_attr else None + if split == None: + return getattr(ctx.attr, attr_name, default) + if not split: + return default + platform = ctx.fragments.platform.platform + if platform and platform.name in split: + return split[platform.name] + return split[sorted(split.keys())[0]] def _get_runfiles(ctx, attrs): all_runfiles = [] @@ -356,8 +366,11 @@ failure_infos = _collect_providers(FailureInfo, *all_deps) if failure_infos: error = "in label '%s':" % label + seen_errors = {} for failure_info in failure_infos: - error += "\n\t" + failure_info.error + if failure_info.error not in seen_errors: + seen_errors[failure_info.error] = True + error += "\n\t" + failure_info.error _error(error) def _run_validation( @@ -463,7 +476,7 @@ copy_dir = _copy_dir, expand_make_vars = _expand_make_vars, first = _first, - dedupe_split_attr = _dedupe_split_attr, + get_primary_split = _get_primary_split, get_runfiles = _get_runfiles, join_depsets = _join_depsets, only = _only,