@@ -50,7 +50,6 @@ load("//rules/acls:android_binary_with_sandboxed_sdks_allowlist.bzl", "ANDROID_B
5050load ("//rules/acls:android_build_stamping_rollout.bzl" , "ANDROID_BUILD_STAMPING_FALLBACK" , "ANDROID_BUILD_STAMPING_ROLLOUT" )
5151load ("//rules/acls:android_device_plugin_rollout.bzl" , "ANDROID_DEVICE_PLUGIN_FALLBACK" , "ANDROID_DEVICE_PLUGIN_ROLLOUT" )
5252load ("//rules/acls:android_feature_splits_dogfood.bzl" , "ANDROID_FEATURE_SPLITS_DOGFOOD" )
53- load ("//rules/acls:android_instrumentation_binary_starlark_resources.bzl" , "ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_FALLBACK" , "ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_ROLLOUT" )
5453load ("//rules/acls:android_instrumentation_test_manifest_check_rollout.bzl" , "ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_FALLBACK" , "ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_ROLLOUT" )
5554load ("//rules/acls:android_instrumentation_test_prebuilt_test_apk.bzl" , "ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_FALLBACK" , "ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_ROLLOUT" )
5655load ("//rules/acls:android_library_starlark_resource_outputs.bzl" , "ANDROID_LIBRARY_STARLARK_RESOURCE_OUTPUTS_FALLBACK" , "ANDROID_LIBRARY_STARLARK_RESOURCE_OUTPUTS_ROLLOUT" )
@@ -112,9 +111,6 @@ def _in_android_archive_excluded_deps_denylist(fqn):
112111def _in_android_device_plugin_rollout (fqn ):
113112 return not matches (fqn , ANDROID_DEVICE_PLUGIN_FALLBACK_DICT ) and matches (fqn , ANDROID_DEVICE_PLUGIN_ROLLOUT_DICT )
114113
115- def _in_android_instrumentation_binary_starlark_resources (fqn ):
116- return not matches (fqn , ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_FALLBACK_DICT ) and matches (fqn , ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_ROLLOUT_DICT )
117-
118114def _in_android_binary_starlark_javac (fqn ):
119115 return not matches (fqn , ANDROID_BINARY_STARLARK_JAVAC_FALLBACK_DICT ) and matches (fqn , ANDROID_BINARY_STARLARK_JAVAC_ROLLOUT_DICT )
120116
@@ -258,8 +254,6 @@ ANDROID_ARCHIVE_DOGFOOD_DICT = make_dict(ANDROID_ARCHIVE_DOGFOOD)
258254ANDROID_ARCHIVE_EXCLUDED_DEPS_DENYLIST_DICT = make_dict (ANDROID_ARCHIVE_EXCLUDED_DEPS_DENYLIST )
259255ANDROID_DEVICE_PLUGIN_ROLLOUT_DICT = make_dict (ANDROID_DEVICE_PLUGIN_ROLLOUT )
260256ANDROID_DEVICE_PLUGIN_FALLBACK_DICT = make_dict (ANDROID_DEVICE_PLUGIN_FALLBACK )
261- ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_ROLLOUT_DICT = make_dict (ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_ROLLOUT )
262- ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_FALLBACK_DICT = make_dict (ANDROID_INSTRUMENTATION_BINARY_STARLARK_RESOURCES_FALLBACK )
263257ANDROID_BINARY_STARLARK_JAVAC_ROLLOUT_DICT = make_dict (ANDROID_BINARY_STARLARK_JAVAC_ROLLOUT )
264258ANDROID_BINARY_STARLARK_JAVAC_FALLBACK_DICT = make_dict (ANDROID_BINARY_STARLARK_JAVAC_FALLBACK )
265259ANDROID_BINARY_STARLARK_SPLIT_TRANSITION_ROLLOUT_DICT = make_dict (ANDROID_BINARY_STARLARK_SPLIT_TRANSITION_ROLLOUT )
@@ -379,7 +373,6 @@ acls = struct(
379373 in_android_archive_dogfood = _in_android_archive_dogfood ,
380374 in_android_archive_excluded_deps_denylist = _in_android_archive_excluded_deps_denylist ,
381375 in_android_device_plugin_rollout = _in_android_device_plugin_rollout ,
382- in_android_instrumentation_binary_starlark_resources = _in_android_instrumentation_binary_starlark_resources ,
383376 in_android_binary_starlark_javac = _in_android_binary_starlark_javac ,
384377 in_android_binary_starlark_split_transition = _in_android_binary_starlark_split_transition ,
385378 in_android_binary_with_sandboxed_sdks_allowlist = _in_android_binary_with_sandboxed_sdks_allowlist ,
0 commit comments