Skip to content

Commit 516ea47

Browse files
zhaoqxucopybara-github
authored andcommitted
Internal change
PiperOrigin-RevId: 728797431 Change-Id: I0e7c5560c0e09e7a710c4a19ed3aa1293c9ed1d7
1 parent 2224708 commit 516ea47

2 files changed

Lines changed: 34 additions & 0 deletions

File tree

rules/acls.bzl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ load(
7272
load("//rules/acls:proguard_apply_mapping.bzl", "ALLOW_PROGUARD_APPLY_MAPPING")
7373
load("//rules/acls:r8.bzl", "USE_R8")
7474
load("//rules/acls:record_desugaring.bzl", "RECORD_DESUGARING_FALLBACK", "RECORD_DESUGARING_ROLLOUT")
75+
load("//rules/acls:resource_translation_merging_rollout.bzl", "RESOURCE_TRANSLATION_MERGING_FALLBACK", "RESOURCE_TRANSLATION_MERGING_ROLLOUT")
7576
load("//rules/acls:shared_library_resource_linking.bzl", "SHARED_LIBRARY_RESOURCE_LINKING_ALLOWLIST")
7677
load("//rules/acls:stamp_signing.bzl", "STAMP_SIGNING_FALLBACK", "STAMP_SIGNING_ROLLOUT")
7778
load("//rules/acls:test_to_instrument_test_rollout.bzl", "TEST_TO_INSTRUMENT_TEST_FALLBACK", "TEST_TO_INSTRUMENT_TEST_ROLLOUT")
@@ -215,6 +216,9 @@ def _in_stamp_signing_rollout(fqn):
215216
def _in_desugaring_runtime_jar_classpath_rollout():
216217
return DESUGAR_USE_RUNTIME_JARS
217218

219+
def _in_resource_translation_merging_rollout(fqn):
220+
return matches(fqn, RESOURCE_TRANSLATION_MERGING_ROLLOUT_DICT) and not matches(fqn, RESOURCE_TRANSLATION_MERGING_FALLBACK_DICT)
221+
218222
def make_dict(lst):
219223
"""Do not use this method outside of acls directory."""
220224
return {t: True for t in lst}
@@ -283,6 +287,8 @@ RECORD_DESUGARING_FALLBACK_DICT = make_dict(RECORD_DESUGARING_FALLBACK)
283287
RECORD_DESUGARING_ROLLOUT_DICT = make_dict(RECORD_DESUGARING_ROLLOUT)
284288
STAMP_SIGNING_ROLLOUT_DICT = make_dict(STAMP_SIGNING_ROLLOUT)
285289
STAMP_SIGNING_FALLBACK_DICT = make_dict(STAMP_SIGNING_FALLBACK)
290+
RESOURCE_TRANSLATION_MERGING_ROLLOUT_DICT = make_dict(RESOURCE_TRANSLATION_MERGING_ROLLOUT)
291+
RESOURCE_TRANSLATION_MERGING_FALLBACK_DICT = make_dict(RESOURCE_TRANSLATION_MERGING_FALLBACK)
286292

287293
def matches(fqn, dct):
288294
# Labels with workspace names ("@workspace//pkg:target") are not supported.
@@ -379,6 +385,7 @@ acls = struct(
379385
in_record_desugaring_rollout = _in_record_desugaring_rollout,
380386
in_stamp_signing_rollout = _in_stamp_signing_rollout,
381387
in_desugaring_runtime_jar_classpath_rollout = _in_desugaring_runtime_jar_classpath_rollout,
388+
in_resource_translation_merging_rollout = _in_resource_translation_merging_rollout,
382389
)
383390

384391
# Visible for testing
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Copyright 2025 The Bazel Authors. All rights reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
"""Allow list for resource string translation merging in Android Rules."""
15+
16+
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
17+
18+
visibility(PROJECT_VISIBILITY)
19+
20+
# keep sorted
21+
RESOURCE_TRANSLATION_MERGING_ROLLOUT = [
22+
]
23+
24+
# keep sorted
25+
RESOURCE_TRANSLATION_MERGING_FALLBACK = [
26+
"//:__subpackages__",
27+
]

0 commit comments

Comments
 (0)