Pipe --feature-flags through to some aapt2 actions.

We may need to wire this through elsewhere in the future.

PiperOrigin-RevId: 820391042
Change-Id: I5224553f5172e6d6e3bb4214e477ba1f4533b773

Author: timpeut

rules/acls.bzl

@@ -27,6 +27,7 @@ To update a list:
 """
 
 load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
+load("//rules/acls:aapt2_feature_flags.bzl", "AAPT2_FEATURE_FLAGS")
 load("//rules/acls:aar_import_deps_checker.bzl", "AAR_IMPORT_DEPS_CHECKER_FALLBACK", "AAR_IMPORT_DEPS_CHECKER_ROLLOUT")
 load("//rules/acls:aar_import_explicit_exports_manifest.bzl", "AAR_IMPORT_EXPLICIT_EXPORTS_MANIFEST")
 load("//rules/acls:aar_import_exports_r_java.bzl", "AAR_IMPORT_EXPORTS_R_JAVA")
@@ -223,6 +224,9 @@ def _in_d8_optimization_metadata(fqn):
 def _in_enable_exported_lint_checks(fqn):
     return matches(fqn, ENABLE_EXPORTED_LINT_CHECKS_DICT)
 
+def _get_aapt2_feature_flags(_):
+    return AAPT2_FEATURE_FLAGS
+
 def make_dict(lst):
     """Do not use this method outside of acls directory."""
     return {t: True for t in lst}
@@ -391,6 +395,7 @@ acls = struct(
     in_desugaring_runtime_jar_classpath_rollout = _in_desugaring_runtime_jar_classpath_rollout,
     in_resource_translation_merging_rollout = _in_resource_translation_merging_rollout,
     in_enable_exported_lint_checks = _in_enable_exported_lint_checks,
+    get_aapt2_feature_flags = _get_aapt2_feature_flags,
 )
 
 # Visible for testing

rules/acls/aapt2_feature_flags.bzl

@@ -0,0 +1,16 @@
+# Copyright 2025 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.
+"""Feature flags to pass to the aapt2 link command."""
+
+AAPT2_FEATURE_FLAGS = ""

rules/android_binary/impl.bzl

@@ -124,6 +124,7 @@ def _process_resources(ctx, manifest_ctx, java_package, **unused_ctxs):
         busybox = get_android_toolchain(ctx).android_resources_busybox.files_to_run,
         host_javabase = ctx.attr._host_javabase,
         use_r_package = ctx.attr.use_r_package,
+        feature_flags = acls.get_aapt2_feature_flags(str(ctx.label)),
     )
     return ProviderInfo(
         name = "packaged_resources_ctx",

rules/android_library/impl.bzl

@@ -175,6 +175,7 @@ def _process_resources(ctx, java_package, manifest_ctx, localized_ctx, **unused_
         deps = ctx.attr.deps,
         resource_apks = resource_apks,
         exports = ctx.attr.exports,
+        feature_flags = acls.get_aapt2_feature_flags(str(ctx.label)),
 
         # Processing behavior changing flags.
         enable_res_v3 = _flags.get(ctx).android_enable_res_v3,

rules/busybox.bzl

@@ -226,6 +226,7 @@ def _package(
         shrink_resource_cycles = False,
         version_name = None,
         version_code = None,
+        feature_flags = "",
         android_jar = None,
         aapt = None,
         busybox = None,
@@ -406,6 +407,8 @@ def _package(
         args.add("--versionCode", version_code)
     if java_package:
         args.add("--packageForR", java_package)
+    if feature_flags:
+        args.add("--featureFlags", feature_flags)
 
     args.add_joined(
         "--resourceApks",
@@ -569,6 +572,7 @@ def _validate_and_link(
         transitive_compiled_resources = depset(),
         java_package = None,
         manifest = None,
+        feature_flags = "",
         resource_apks = [],
         android_jar = None,
         busybox = None,
@@ -630,6 +634,8 @@ def _validate_and_link(
         join_with = ":",
     )
     input_files.extend(resource_apks)
+    if feature_flags:
+        args.add("--featureFlags", feature_flags)
 
     _set_warning_level(ctx, args)
 

rules/resources.bzl

@@ -495,6 +495,7 @@ def _package(
         should_compile_java_srcs = True,
         generate_minsdk_proguard_config = False,
         build_java_with_final_resources = False,
+        feature_flags = "",
         aapt = None,
         has_local_proguard_specs = False,
         android_jar = None,
@@ -764,6 +765,7 @@ def _package(
         shrink_resource_cycles = shrink_resource_cycles,
         version_name = manifest_values[_VERSION_NAME] if _VERSION_NAME in manifest_values else None,
         version_code = manifest_values[_VERSION_CODE] if _VERSION_CODE in manifest_values else None,
+        feature_flags = feature_flags,
         android_jar = android_jar,
         aapt = aapt,
         busybox = busybox,
@@ -1188,6 +1190,7 @@ def _process_starlark(
         deps = [],
         resource_apks = [],
         exports = [],
+        feature_flags = "",
         resource_files = None,
         neverlink = False,
         enable_data_binding = False,
@@ -1228,6 +1231,7 @@ def _process_starlark(
         attributes are considered direct dependencies of any rule that directly
         depends on the target with exports. The exports are not direct deps of
         the rule they belong to (TODO(b/144134042): make this so).
+      feature_flags: string. The string value for --feature-flags to pass to aapt2.
       resource_files: sequence of Files. A list of Android resource files to be
         processed.
       neverlink: boolean. Only use this library for compilation and not runtime.
@@ -1406,6 +1410,7 @@ def _process_starlark(
                 transitive_compiled_resources = transitive_compiled_resources,
                 transitive_manifests = transitive_manifests,
                 transitive_r_txts = transitive_r_txts,
+                feature_flags = feature_flags,
                 package_type = "LIBRARY",
                 java_package = java_package,
                 android_jar = android_jar,
@@ -1582,6 +1587,7 @@ def _process_starlark(
             ),
             java_package = java_package,
             manifest = processed_manifest,
+            feature_flags = feature_flags,
             android_jar = android_jar,
             aapt = aapt,
             busybox = busybox,
@@ -1795,6 +1801,7 @@ def _process(
         deps = [],
         resource_apks = [],
         exports = [],
+        feature_flags = "",
         android_jar = None,
         android_kit = None,
         aapt = None,
@@ -1821,6 +1828,7 @@ def _process(
         deps = deps,
         resource_apks = resource_apks,
         exports = exports,
+        feature_flags = feature_flags,
         resource_files = resource_files,
         enable_data_binding = enable_data_binding,
         fix_resource_transitivity = fix_resource_transitivity,

src/tools/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java

@@ -405,6 +405,7 @@ public static void main(String[] args) throws Exception {
               .includeGeneratedLocales(aaptConfigOptions.generatePseudoLocale)
               .includeOnlyConfigs(aaptConfigOptions.resourceConfigs)
               .includeProguardLocationReferences(options.includeProguardLocationReferences)
+              .featureFlags(aaptConfigOptions.featureFlags)
               .link(compiled);
       profiler.recordEndOf("link").startTask("validate");
 

src/tools/java/com/google/devtools/build/android/ValidateAndLinkResourcesAction.java

@@ -178,6 +178,7 @@ public static void main(String[] args) throws Exception {
           .resourceApks(resourceApks)
           .buildVersion(aapt2Options.buildToolsVersion)
           .outputAsProto(aapt2Options.resourceTableAsProto)
+          .featureFlags(aapt2Options.featureFlags)
           .linkStatically(resources)
           .copyLibraryTo(options.staticLibraryOut)
           .copySourceJarTo(options.sourceJarOut)

src/tools/java/com/google/devtools/build/android/aapt2/Aapt2ConfigOptions.java

@@ -117,4 +117,9 @@ public class Aapt2ConfigOptions {
       arity = 1,
       description = "Indicates whether databinding generated files should depend on AndroidX.")
   public boolean useDataBindingAndroidX;
+
+  @Parameter(
+      names = "--featureFlags",
+      description = "Optional --feature-flags to pass to certain aapt2 commands.")
+  public String featureFlags = "";
 }

src/tools/java/com/google/devtools/build/android/aapt2/ResourceLinker.java

@@ -157,6 +157,7 @@ public static LinkError of(Throwable e) {
   private boolean conditionalKeepRules = false;
   private boolean includeProguardLocationReferences = false;
   private List<StaticLibrary> resourceApks = ImmutableList.of();
+  private String featureFlags = "";
 
   private ResourceLinker(
       Path aapt2, ListeningExecutorService executorService, Path workingDirectory) {
@@ -251,6 +252,12 @@ public ResourceLinker resourceApks(List<StaticLibrary> resourceApks) {
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public ResourceLinker featureFlags(String featureFlags) {
+    this.featureFlags = featureFlags;
+    return this;
+  }
+
   /**
    * Statically links the {@link CompiledResources} with the dependencies to produce a {@link
    * StaticLibrary}.
@@ -278,6 +285,7 @@ public StaticLibrary linkStatically(CompiledResources compiled) {
               .add("--manifest", compiled.getManifest())
               .add("--no-static-lib-packages")
               .add("--custom-package", customPackage)
+              .add("--feature-flags", featureFlags)
               .whenVersionIsAtLeast(new Revision(23))
               .thenAdd("--no-version-vectors")
               .addParameterableRepeated(
@@ -308,6 +316,7 @@ public StaticLibrary linkStatically(CompiledResources compiled) {
                 .thenAdd("--no-version-vectors")
                 .when(outputAsProto)
                 .thenAdd("--proto-format")
+                .add("--feature-flags", featureFlags)
                 // only link against jars
                 .addRepeated("-I", pathsToLinkAgainst.stream().filter(IS_JAR).collect(toList()))
                 .addRepeated("-I", resourceApkPathsToLinkAgainst)
@@ -480,6 +489,7 @@ private ProtoApk linkProtoApk(
             .when(conditionalKeepRules)
             .thenAdd("--proguard-conditional-keep-rules")
             .add("-o", linked)
+            .add("--feature-flags", featureFlags)
             .execute(String.format("Linking %s", compiled.getManifest())));
     profiler.recordEndOf("fulllink");
     return ProtoApk.readFrom(optimize(compiled, linked));