aboutsummaryrefslogtreecommitdiff
path: root/rules/acls
diff options
context:
space:
mode:
Diffstat (limited to 'rules/acls')
-rw-r--r--rules/acls/android_instrumentation_derived_test_class_rollout.bzl23
-rw-r--r--rules/acls/android_instrumentation_test_manifest_check_rollout.bzl (renamed from rules/acls/fix_application_id.bzl)11
-rw-r--r--rules/acls/android_library_starlark_resource_outputs.bzl26
-rw-r--r--rules/acls/lint_registry_rollout.bzl21
4 files changed, 73 insertions, 8 deletions
diff --git a/rules/acls/android_instrumentation_derived_test_class_rollout.bzl b/rules/acls/android_instrumentation_derived_test_class_rollout.bzl
new file mode 100644
index 0000000..782beb8
--- /dev/null
+++ b/rules/acls/android_instrumentation_derived_test_class_rollout.bzl
@@ -0,0 +1,23 @@
+# Copyright 2021 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Rollout list for enabling test class derivation in android_instrumentation_test,"""
+
+ANDROID_INSTRUMENTATION_TEST_DERIVED_TEST_CLASS_ROLLOUT = [
+ "//:__subpackages__",
+]
+
+ANDROID_INSTRUMENTATION_TEST_DERIVED_TEST_CLASS_FALLBACK = [
+ "//javatests/notinacl:__subpackages__",
+]
diff --git a/rules/acls/fix_application_id.bzl b/rules/acls/android_instrumentation_test_manifest_check_rollout.bzl
index 41c18b7..154f6bb 100644
--- a/rules/acls/fix_application_id.bzl
+++ b/rules/acls/android_instrumentation_test_manifest_check_rollout.bzl
@@ -12,16 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Allowlist for fixing the implicit application ID in manifest processing.
+"""Rollout list for enabling manifest validation in android_instrumentation_test."""
-See b/111923269 for context.
-"""
-
-# keep sorted
-FIX_APPLICATION_ID_ROLLOUT = [
+ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_ROLLOUT = [
"//:__subpackages__",
]
-# keep sorted
-FIX_APPLICATION_ID_FALLBACK = [
+ANDROID_INSTRUMENTATION_TEST_MANIFEST_CHECK_FALLBACK = [
]
diff --git a/rules/acls/android_library_starlark_resource_outputs.bzl b/rules/acls/android_library_starlark_resource_outputs.bzl
new file mode 100644
index 0000000..b798fa3
--- /dev/null
+++ b/rules/acls/android_library_starlark_resource_outputs.bzl
@@ -0,0 +1,26 @@
+# Copyright 2021 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Allow list for setting the resource outputs (.srcjar, R.txt, and _resources.jar) of android_library to
+those files generated by the Starlark resource processing pipeline and not the native resource
+processing pipeline. These resource-related predeclared outputs need to be re-pointed to the corresponding
+artifacts in the Starlark pipeline. See b/177261846."""
+
+# keep sorted
+ANDROID_LIBRARY_STARLARK_RESOURCE_OUTPUTS_ROLLOUT = [
+ "//:__subpackages__",
+]
+
+ANDROID_LIBRARY_STARLARK_RESOURCE_OUTPUTS_FALLBACK = [
+]
diff --git a/rules/acls/lint_registry_rollout.bzl b/rules/acls/lint_registry_rollout.bzl
new file mode 100644
index 0000000..3138f94
--- /dev/null
+++ b/rules/acls/lint_registry_rollout.bzl
@@ -0,0 +1,21 @@
+# Copyright 2021 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Allow list for the Android Lint Registry target."""
+
+# keep sorted
+LINT_REGISTRY_ROLLOUT = [
+]
+
+LINT_REGISTRY_FALLBACK = []