Remove acl for shared resource linking. This is generally available now, and no riskier than any other neverlinking (which is also generally available). PiperOrigin-RevId: 994739150 Change-Id: Idc14980232323c27228545747d7e79bb25daf739
diff --git a/rules/acls.bzl b/rules/acls.bzl index bdf0c01..6708668 100644 --- a/rules/acls.bzl +++ b/rules/acls.bzl
@@ -73,7 +73,6 @@ load("//rules/acls:proguard_apply_mapping.bzl", "ALLOW_PROGUARD_APPLY_MAPPING") load("//rules/acls:r8.bzl", "USE_R8") load("//rules/acls:resource_translation_merging_rollout.bzl", "RESOURCE_TRANSLATION_MERGING_FALLBACK", "RESOURCE_TRANSLATION_MERGING_ROLLOUT") -load("//rules/acls:shared_library_resource_linking.bzl", "SHARED_LIBRARY_RESOURCE_LINKING_ALLOWLIST") load("//rules/acls:stamp_signing.bzl", "STAMP_SIGNING_FALLBACK", "STAMP_SIGNING_ROLLOUT") load("//rules/acls:test_to_instrument_test_rollout.bzl", "TEST_TO_INSTRUMENT_TEST_FALLBACK", "TEST_TO_INSTRUMENT_TEST_ROLLOUT") load("//rules/acls:use_baseline_as_startup_profile.bzl", "USE_BASELINE_AS_STARTUP_PROFILE_FALLBACK", "USE_BASELINE_AS_STARTUP_PROFILE_ROLLOUT") @@ -169,9 +168,6 @@ def _get_android_archive_duplicate_class_allowlist(fqn): return ANDROID_ARCHIVE_DUPLICATE_CLASS_ALLOWLIST.get(fqn, []) -def _in_shared_library_resource_linking_allowlist(fqn): - return matches(fqn, SHARED_LIBRARY_RESOURCE_LINKING_DICT) - def _in_android_binary_min_sdk_version_attribute_allowlist(fqn): return matches(fqn, ANDROID_BINARY_MIN_SDK_VERSION_ATTRIBUTE_DICT) @@ -276,7 +272,6 @@ ANDROID_APK_TO_BUNDLE_FEATURES_DICT = make_dict(ANDROID_APK_TO_BUNDLE_FEATURES) DATABINDING_ALLOWED_DICT = make_dict(DATABINDING_ALLOWED) DATABINDING_DISALLOWED_DICT = make_dict(DATABINDING_DISALLOWED) -SHARED_LIBRARY_RESOURCE_LINKING_DICT = make_dict(SHARED_LIBRARY_RESOURCE_LINKING_ALLOWLIST) ANDROID_BINARY_MIN_SDK_VERSION_ATTRIBUTE_DICT = make_dict(ANDROID_BINARY_MIN_SDK_VERSION_ATTRIBUTE_ALLOWLIST) ANDROID_BINARY_RAW_ACCESS_TO_RESOURCE_PATHS_ALLOWLIST_DICT = make_dict(ANDROID_BINARY_RAW_ACCESS_TO_RESOURCE_PATHS_ALLOWLIST) ANDROID_BINARY_RESOURCE_NAME_OBFUSCATION_OPT_OUT_ALLOWLIST_DICT = make_dict(ANDROID_BINARY_RESOURCE_NAME_OBFUSCATION_OPT_OUT_ALLOWLIST) @@ -376,7 +371,6 @@ in_baseline_profiles_rollout = _in_baseline_profiles_rollout, in_baseline_profiles_optimizer_integration = _in_baseline_profiles_optimizer_integration, in_android_apk_to_bundle_features = _in_android_apk_to_bundle_features, - in_shared_library_resource_linking_allowlist = _in_shared_library_resource_linking_allowlist, in_android_binary_min_sdk_version_attribute_allowlist = _in_android_binary_min_sdk_version_attribute_allowlist, in_android_binary_raw_access_to_resource_paths_allowlist = _in_android_binary_raw_access_to_resource_paths_allowlist, in_android_binary_resource_name_obfuscation_opt_out_allowlist = _in_android_binary_resource_name_obfuscation_opt_out_allowlist,
diff --git a/rules/resources.bzl b/rules/resources.bzl index fab794a..dc4f14e 100644 --- a/rules/resources.bzl +++ b/rules/resources.bzl
@@ -646,21 +646,6 @@ if node_info.exports_manifest ]) - if not acls.in_shared_library_resource_linking_allowlist(str(ctx.label)): - # to_list() safe to use as we expect this to be an empty depset in the non-error case - all_res_apks = depset( - resource_apks, - transitive = transitive_resource_apks, - order = "preorder", - ).to_list() - if all_res_apks: - fail( - "%s has resource apks in the transitive closure without being allowlisted.\n%s" % ( - ctx.label, - all_res_apks, - ), - ) - # TODO(b/156763506): Add analysis tests to verify logic around when manifest merging is configured. # TODO(b/154153771): Run the android merger if mergee_manifests or manifest values are present. merged_manifest = g3itr_manifest