diff options
| author | A Googler <no-reply@google.com> | 2023-03-15 10:19:12 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-15 10:20:02 -0700 |
| commit | 52b9802223bee60e87b8df2dbe81b3776bf7655e (patch) | |
| tree | bac76031f5d158a2a69df7189e6518f8a4144cff | |
| parent | 0d84923b7fc9701d261ae353b6a2b37bf5dc93c3 (diff) | |
| download | bazelbuild-rules_android-52b9802223bee60e87b8df2dbe81b3776bf7655e.tar.gz | |
Create separate rollout and fallback lists for a_i_t prebuilt apk acl.
PiperOrigin-RevId: 516861002
Change-Id: Ib77f367ba8e0e32194893d0fcb345fa783fe9ac8
| -rw-r--r-- | rules/acls.bzl | 7 | ||||
| -rw-r--r-- | rules/acls/android_instrumentation_test_prebuilt_test_apk.bzl | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/rules/acls.bzl b/rules/acls.bzl index 56ebcd1..c84ed18 100644 --- a/rules/acls.bzl +++ b/rules/acls.bzl @@ -70,7 +70,7 @@ load( ) load("//rules/acls:kt_android_library_rollout.bzl", "KT_ANDROID_LIBRARY_FALLBACK", "KT_ANDROID_LIBRARY_ROLLOUT") load("//rules/acls:android_instrumentation_test_manifest_check_rollout.bzl", "ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_FALLBACK", "ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_ROLLOUT") -load("//rules/acls:android_instrumentation_test_prebuilt_test_apk.bzl", "ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK") +load("//rules/acls:android_instrumentation_test_prebuilt_test_apk.bzl", "ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_FALLBACK", "ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_ROLLOUT") load("//rules/acls:android_rules_with_kt_rollout.bzl", "ANDROID_RULES_WITH_KT_FALLBACK", "ANDROID_RULES_WITH_KT_ROLLOUT") load("//rules/acls:baseline_profiles_rollout.bzl", "BASELINE_PROFILES_ROLLOUT") load("//rules/acls:enforce_min_sdk_floor_rollout.bzl", "ENFORCE_MIN_SDK_FLOOR_FALLBACK", "ENFORCE_MIN_SDK_FLOOR_ROLLOUT") @@ -194,7 +194,7 @@ def _in_android_instrumentation_test_manifest_check_rollout(fqn): return not matches(fqn, ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_FALLBACK_DICT) and matches(fqn, ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_ROLLOUT_DICT) def _in_android_instrumentation_test_prebuilt_test_apk(fqn): - return matches(fqn, ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_DICT) + return matches(fqn, ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_ROLLOUT_DICT) and not matches(fqn, ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_FALLBACK_DICT) def _in_android_rules_with_kt_rollout(fqn): return not matches(fqn, ANDROID_RULES_WITH_KT_FALLBACK_DICT) and matches(fqn, ANDROID_RULES_WITH_KT_ROLLOUT_DICT) @@ -285,7 +285,8 @@ KT_ANDROID_LIBRARY_ROLLOUT_DICT = make_dict(KT_ANDROID_LIBRARY_ROLLOUT) KT_ANDROID_LIBRARY_FALLBACK_DICT = make_dict(KT_ANDROID_LIBRARY_FALLBACK) ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_ROLLOUT_DICT = make_dict(ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_ROLLOUT) ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_FALLBACK_DICT = make_dict(ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_FALLBACK) -ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_DICT = make_dict(ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK) +ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_ROLLOUT_DICT = make_dict(ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_ROLLOUT) +ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_FALLBACK_DICT = make_dict(ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_FALLBACK) BASELINE_PROFILES_ROLLOUT_DICT = make_dict(BASELINE_PROFILES_ROLLOUT) ENFORCE_MIN_SDK_FLOOR_ROLLOUT_DICT = make_dict(ENFORCE_MIN_SDK_FLOOR_ROLLOUT) ENFORCE_MIN_SDK_FLOOR_FALLBACK_DICT = make_dict(ENFORCE_MIN_SDK_FLOOR_FALLBACK) diff --git a/rules/acls/android_instrumentation_test_prebuilt_test_apk.bzl b/rules/acls/android_instrumentation_test_prebuilt_test_apk.bzl index 64aaa17..fb3b431 100644 --- a/rules/acls/android_instrumentation_test_prebuilt_test_apk.bzl +++ b/rules/acls/android_instrumentation_test_prebuilt_test_apk.bzl @@ -15,5 +15,8 @@ """Allow list of a_i_t targets allowed to use a prebuilt test apk.""" # keep sorted -ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK = [ +ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_ROLLOUT = [ +] + +ANDROID_INSTRUMENTATION_TEST_PREBUILT_TEST_APK_FALLBACK = [ ] |