more fixes

keith · keith · commit 7d8d8042c26f · 2026-07-07T14:01:25.000-07:00
diff --git a/mobile_install/apks.bzl b/mobile_install/apks.bzl
@@ -106,7 +106,26 @@ def make_split_apks(
         key_rotation_min_sdk,
         zipalign_alignment,
         sibling):
-    """Create a split for each dex and for resources"""
+    """Create a split for each dex and for resources.
+
+    Args:
+      ctx: The context.
+      manifest: The merged AndroidManifest.xml.
+      r_dex: The generated R dex artifact.
+      dexes: A list of dex artifacts to package as splits.
+      resource_apk: The resource APK.
+      jar_resources: Java resource jars to package.
+      native_zips: Native library zips to package.
+      swigdeps_file: A generated SWIG deps file.
+      debug_signing_keys: Debug keystores used to sign APKs.
+      debug_signing_lineage_file: File containing the signing lineage.
+      key_rotation_min_sdk: Minimum API level to rotate signing keys for.
+      zipalign_alignment: Zip alignment used before signing.
+      sibling: The file used to root generated outputs.
+
+    Returns:
+      A tuple of the manifest package-name file and the generated split APKs.
+    """
     manifest_package_name = utils.isolated_declare_file(ctx, "manifest_package_name.txt", sibling = sibling)
     manifests = {}
     artifacts = {}
diff --git a/mobile_install/mi.bzl b/mobile_install/mi.bzl
@@ -57,7 +57,9 @@ def make_aspect(
       dex_shards: Number of dex shards to split the project across.
       is_cmd: A Boolean, when True the aspect is running in the context of the
         mobile-install command. If False it is as a rule (e.g. mi_test).
+      is_test: Whether the aspect is running for a test rule.
       res_shards: Number of Android resource shards during processing.
+      tools: Tool attributes to attach to the aspect.
     Returns:
       A configured aspect.
     """
diff --git a/mobile_install/process.bzl b/mobile_install/process.bzl
@@ -58,6 +58,7 @@ def process(
       debug_signing_keys: Debug keystores to be used to sign the apk.
       debug_signing_lineage_file: File containing the signing lineage.
       key_rotation_min_sdk: String of the minimum API level to rotate signing keys for.
+      zipalign_alignment: Zip alignment used before signing.
       apk: The generated apk for the app.
       sibling: The path to the launcher file.
 
diff --git a/mobile_install/resources.bzl b/mobile_install/resources.bzl
@@ -51,7 +51,15 @@ res_types = [
 ]
 
 def get_assets_dir(asset, base_dir):
-    """Build the full assets directory sanitizing the input first."""
+    """Build the full assets directory sanitizing the input first.
+
+    Args:
+      asset: The asset file or directory.
+      base_dir: The base assets directory.
+
+    Returns:
+      The sanitized assets directory path.
+    """
     if base_dir == "":
         # some targets specify assets files and set assets_dirs = ""
         return asset.dirname
diff --git a/mobile_install/transform.bzl b/mobile_install/transform.bzl
@@ -131,7 +131,7 @@ def merge_dex_shards(ctx, data, sibling):
     action per shard that runs dex_shard_merger on all dex files within that
     shard.
 
-    Arguments:
+    Args:
       ctx: The context.
       data: A list of lists, where the inner list contains dex shards.
       sibling: A file used to root the merged_dex shards.
diff --git a/prereqs.bzl b/prereqs.bzl
@@ -19,7 +19,11 @@ load("//bzlmod_extensions:apksig.bzl", _apksig_archive = "apksig")
 load("//bzlmod_extensions:com_android_dex.bzl", _com_android_dex_archive = "com_android_dex")
 
 def rules_android_prereqs(dev_mode = False):
-    """Downloads prerequisite repositories for rules_android."""
+    """Downloads prerequisite repositories for rules_android.
+
+    Args:
+      dev_mode: Whether to include development dependencies.
+    """
 
     maybe(
         http_archive,
diff --git a/providers/providers.bzl b/providers/providers.bzl
@@ -125,6 +125,7 @@ InstrumentedAppInfo = provider(
 )
 
 FailureInfo = provider(
+    doc = "Provides failure information.",
     fields = dict(
         error = "Error message",
     ),
diff --git a/rules/acls.bzl b/rules/acls.bzl
@@ -302,11 +302,21 @@ BYTECODE_TRANSFORMERS_DICT = make_dict(BYTECODE_TRANSFORMERS)
 AAR_IMPORT_PROPAGATE_NATIVE_LIBS_FALLBACK_DICT = make_dict(AAR_IMPORT_PROPAGATE_NATIVE_LIBS_FALLBACK)
 
 def matches(fqn, dct):
+    """Returns whether a fully qualified label matches an ACL dictionary.
+
+    Args:
+      fqn: The fully qualified label to match.
+      dct: The ACL dictionary.
+
+    Returns:
+      True if the label matches the ACL dictionary.
+    """
+
     # Labels with workspace names ("@workspace//pkg:target") are not supported.
     # For now, default external dependency ACLs to True to enable rollout features for all
     # external users. See https://github.com/bazelbuild/rules_android/issues/68
     # Note that this only affects Bazel builds with OSS rules_android.
-    if fqn.startswith("@") and not fqn.startswith("@//") and not fqn.startswith("@@//"):
+    if fqn.startswith("@") and not fqn.startswith("@//") and not fqn.startswith("@@//"):  # buildifier: disable=canonical-repository
         return True
 
     # "@//" is the same as the main workspace. It's not completely accurate to treat these as
@@ -317,7 +327,7 @@ def matches(fqn, dct):
         fqn = fqn[1:]
 
     # "@@//" refers to the canonical name of the main repository.
-    if fqn.startswith("@@//"):
+    if fqn.startswith("@@//"):  # buildifier: disable=canonical-repository
         fqn = fqn[2:]
 
     if not fqn.startswith("//"):
diff --git a/rules/android_application/android_feature_module_rule.bzl b/rules/android_application/android_feature_module_rule.bzl
@@ -91,6 +91,7 @@ android_feature_module = rule(
     _skylark_testable = True,
 )
 
+# buildifier: disable=unnamed-macro
 def get_feature_module_paths(fqn):
     # Given a fqn to an android_feature_module, returns the absolute paths to
     # all implicitly generated targets
diff --git a/rules/android_binary/impl.bzl b/rules/android_binary/impl.bzl
@@ -73,7 +73,7 @@ def _base_validations_processor(ctx, **_unused_ctxs):
         ),
     )
 
-def _process_manifest(ctx, **unused_ctxs):
+def _process_manifest(ctx, **_unused_ctxs):
     manifest_ctx = _resources.bump_min_sdk(
         ctx,
         manifest = ctx.file.manifest,
@@ -86,7 +86,7 @@ def _process_manifest(ctx, **unused_ctxs):
         value = manifest_ctx,
     )
 
-def _process_resources(ctx, manifest_ctx, java_package, **unused_ctxs):
+def _process_resources(ctx, manifest_ctx, java_package, **_unused_ctxs):
     resource_apks = []
     for apk in utils.collect_providers(StarlarkApkInfo, ctx.attr.resource_apks):
         resource_apks.append(apk.signed_apk)
@@ -130,7 +130,7 @@ def _process_resources(ctx, manifest_ctx, java_package, **unused_ctxs):
         value = packaged_resources_ctx,
     )
 
-def _validate_manifest(ctx, packaged_resources_ctx, manifest_ctx, **unused_ctxs):
+def _validate_manifest(ctx, packaged_resources_ctx, manifest_ctx, **_unused_ctxs):
     validation_outputs = []
 
     manifest_validation_output = _resources.validate_manifest(
@@ -250,7 +250,7 @@ def _process_jvm(ctx, db_ctx, packaged_resources_ctx, proto_ctx, stamp_ctx, **_u
         ),
     )
 
-def _process_build_info(_unused_ctx, **unused_ctxs):
+def _process_build_info(_unused_ctx, **_unused_ctxs):
     return ProviderInfo(
         name = "build_info_ctx",
         value = struct(
diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl
@@ -119,13 +119,13 @@ def _validate_rule_context(ctx):
         enable_deps_without_srcs = _check_deps_without_java_srcs(ctx),
     )
 
-def _exceptions_processor(ctx, **unused_ctxs):
+def _exceptions_processor(ctx, **_unused_ctxs):
     return ProviderInfo(
         name = "exceptions_ctx",
         value = _validate_rule_context(ctx),
     )
 
-def _process_manifest(ctx, **unused_ctxs):
+def _process_manifest(ctx, **_unused_ctxs):
     manifest_ctx = _resources.bump_min_sdk(
         ctx,
         manifest = ctx.file.manifest,
@@ -136,7 +136,7 @@ def _process_manifest(ctx, **unused_ctxs):
         value = manifest_ctx,
     )
 
-def _process_localized_resources(ctx, **unused_ctxs):
+def _process_localized_resources(ctx, **_unused_ctxs):
     return ProviderInfo(
         name = "localized_ctx",
         value = struct(
@@ -145,7 +145,7 @@ def _process_localized_resources(ctx, **unused_ctxs):
         ),
     )
 
-def _process_resources(ctx, java_package, manifest_ctx, localized_ctx, **unused_ctxs):
+def _process_resources(ctx, java_package, manifest_ctx, localized_ctx, **_unused_ctxs):
     # exports_manifest can be overridden by a bazel flag.
     if ctx.attr.exports_manifest == _attrs.tristate.auto:
         exports_manifest = ctx.fragments.android.get_exports_manifest_default
@@ -203,7 +203,7 @@ def _process_resources(ctx, java_package, manifest_ctx, localized_ctx, **unused_
         value = resources_ctx,
     )
 
-def _process_idl(ctx, **unused_sub_ctxs):
+def _process_idl(ctx, **_unused_sub_ctxs):
     return ProviderInfo(
         name = "idl_ctx",
         value = _idl.process(
@@ -223,7 +223,7 @@ def _process_idl(ctx, **unused_sub_ctxs):
         ),
     )
 
-def _process_data_binding(ctx, java_package, resources_ctx, **unused_sub_ctxs):
+def _process_data_binding(ctx, java_package, resources_ctx, **_unused_sub_ctxs):
     if ctx.attr.enable_data_binding and not acls.in_databinding_allowed(str(ctx.label)):
         fail("This target is not allowed to use databinding and enable_data_binding is True.")
     return ProviderInfo(
@@ -244,7 +244,7 @@ def _process_data_binding(ctx, java_package, resources_ctx, **unused_sub_ctxs):
         ),
     )
 
-def _process_proguard(ctx, idl_ctx, **unused_sub_ctxs):
+def _process_proguard(ctx, idl_ctx, **_unused_sub_ctxs):
     return ProviderInfo(
         name = "proguard_ctx",
         value = _proguard.process_specs(
@@ -261,7 +261,7 @@ def _process_proguard(ctx, idl_ctx, **unused_sub_ctxs):
         ),
     )
 
-def _process_jvm(ctx, exceptions_ctx, resources_ctx, idl_ctx, db_ctx, **unused_sub_ctxs):
+def _process_jvm(ctx, exceptions_ctx, resources_ctx, idl_ctx, db_ctx, **_unused_sub_ctxs):
     java_info = _java.compile_android(
         ctx,
         ctx.outputs.lib_jar,
@@ -297,7 +297,7 @@ def _process_jvm(ctx, exceptions_ctx, resources_ctx, idl_ctx, db_ctx, **unused_s
         ),
     )
 
-def _process_lint_rules(ctx, **unused_sub_ctxs):
+def _process_lint_rules(ctx, **_unused_sub_ctxs):
     providers = []
     if acls.in_enable_exported_lint_checks(str(ctx.label)):
         # Propagate Lint rule Jars from any exported AARs (b/229993446)
@@ -358,7 +358,7 @@ def _process_aar(ctx, resources_ctx, proguard_ctx, **unused_ctx):
         value = _AARContextInfo(**aar_ctx),
     )
 
-def _process_native(ctx, idl_ctx, **unused_ctx):
+def _process_native(ctx, idl_ctx, **_unused_ctx):
     return ProviderInfo(
         name = "native_ctx",
         value = struct(
@@ -381,7 +381,7 @@ def _process_native(ctx, idl_ctx, **unused_ctx):
         ),
     )
 
-def _process_intellij(ctx, java_package, manifest_ctx, resources_ctx, idl_ctx, jvm_ctx, **unused_sub_ctxs):
+def _process_intellij(ctx, java_package, manifest_ctx, resources_ctx, idl_ctx, jvm_ctx, **_unused_sub_ctxs):
     android_ide_info = _intellij.make_android_ide_info(
         ctx,
         java_package = java_package,
@@ -409,7 +409,7 @@ def _process_intellij(ctx, java_package, manifest_ctx, resources_ctx, idl_ctx, j
         ),
     )
 
-def _process_coverage(ctx, **unused_ctx):
+def _process_coverage(ctx, **_unused_ctx):
     return ProviderInfo(
         name = "coverage_ctx",
         value = struct(
@@ -424,7 +424,7 @@ def _process_coverage(ctx, **unused_ctx):
         ),
     )
 
-def _process_baseline_profiles(ctx, **unused_ctx):
+def _process_baseline_profiles(ctx, **_unused_ctx):
     return ProviderInfo(
         name = "bp_ctx",
         value = struct(
@@ -464,7 +464,7 @@ def finalize(
         proguard_ctx,
         providers,
         validation_outputs,
-        **unused_ctxs):
+        **_unused_ctxs):
     """Creates the DefaultInfo and OutputGroupInfo providers.
 
     Args:
@@ -475,7 +475,7 @@ def finalize(
       proguard_ctx: ProviderInfo. The proguard ctx.
       providers: sequence of providers. The providers to propagate.
       validation_outputs: sequence of Files. The validation outputs.
-      **unused_ctxs: Unused ProviderInfo.
+      **_unused_ctxs: Unused ProviderInfo.
 
     Returns:
       A struct with Android and Java legacy providers and a list of providers.
diff --git a/rules/android_local_test/rule.bzl b/rules/android_local_test/rule.bzl
@@ -30,6 +30,7 @@ def make_rule(
     Args:
       attrs: A dict. The attributes for the rule.
       implementation: A function. The rule's implementation method.
+      additional_toolchains: A list. Additional toolchains passed to rule(toolchains).
 
     Returns:
       A rule.
diff --git a/rules/baseline_profiles.bzl b/rules/baseline_profiles.bzl
@@ -118,6 +118,7 @@ def _process_art_profile(
       ctx: The context.
       final_classes_dex: File. Final classes zip artifact.
       merged_profile: File. The merged profile from transitive baseline profile files.
+      output_primary_profile: File. The primary profile output.
       proguard_output_map: File. Optional. The proguard output mapping file.
       profgen: FilesToRunProvider. The profgen executable for profile compilation.
       toolchain_type: Label or String. Toolchain type of the executable used in actions.
diff --git a/rules/bundletool.bzl b/rules/bundletool.bzl
@@ -253,7 +253,7 @@ def _build_sdk_module(
         out = None,
         internal_apk = None,
         bundletool_module_builder = None,
-        host_javabase = None):
+        host_javabase = None):  # @unused
     args = ctx.actions.args()
     args.add("--internal_apk_path", internal_apk)
     args.add("--output_module_path", out)
diff --git a/rules/busybox.bzl b/rules/busybox.bzl
@@ -295,6 +295,7 @@ def _package(
         code and resources by instructing AAPT2 to emit conditional Proguard keep rules.
       version_name: A string. The version name to stamp the generated manifest with. Optional.
       version_code: A string. The version code to stamp the generated manifest with. Optional.
+      feature_flags: Feature flag values to pass to aapt2.
       crunch_png: A boolean. Determines whether `aapt2 compile` should crunch PNG files.
       android_jar: A File. The Android Jar.
       aapt: A FilesToRunProvider. The AAPT executable.
@@ -607,6 +608,7 @@ def _validate_and_link(
         compiled resources from the transitive dependencies of this target.
       java_package: A string. The Java package for the generated R.java.
       manifest: A File. The AndroidManifest.xml.
+      feature_flags: Feature flag values to pass to aapt2.
       resource_apks: List of direct resource only apk files.
       android_jar: A File. The Android Jar.
       busybox: A FilesToRunProvider. The ResourceProcessorBusyBox executable.
@@ -1057,6 +1059,9 @@ def _generate_binary_r(
       final_fields: Bool. Whether fields get declared as final.
       use_r_package: Bool. Whether fields should be generated with an RPackage
         class. Used for privacy sandbox.
+      resources_nodes: Depset of resources node providers.
+      transitive_r_txts: Transitive R.txt files to include.
+      transitive_manifests: Transitive manifests to include.
       busybox: FilesToRunProvider. The ResourceBusyBox executable or
         FilesToRunprovider
       host_javabase: A Target. The host javabase.
diff --git a/rules/dex.bzl b/rules/dex.bzl
@@ -463,6 +463,7 @@ def _optimizing_dex(
         globals_output: File. A file to store information about global singletons generated by the dexer.
         incremental_dexopts: List of strings. Additional command-line flags for the dexing tool when building dexes.
         min_sdk_version: Integer. The minimum targeted sdk version.
+        library_jar: File. Optional library jar used by the optimizing dexer.
         dex_exec: File. The executable dex builder file.
         min_sdk_config: File. Contains a ProGuard config to define the min-sdk generated from the manifest.
         toolchain_type: The Android toolchain.
diff --git a/rules/dex_desugar_aspect.bzl b/rules/dex_desugar_aspect.bzl
@@ -65,7 +65,7 @@ def get_aspect_deps(ctx):
         if attr == "deps" and hasattr(ctx, "split_attr"):
             deps = _utils.dedupe_split_attr(ctx.split_attr.deps)
         elif attr == "_toolchain" and getattr(ctx, "kind", "") == "kt_jvm_toolchain":
-            pass  # TODO(b/370300302): Prevent double-deps on Kotlin toolchain. Delete when fixed.
+            deps = []  # TODO(b/370300302): Prevent double-deps on Kotlin toolchain. Delete when fixed.
         else:
             deps = getattr(ctx.attr, attr, [])
 
diff --git a/rules/flags/flag_defs.bzl b/rules/flags/flag_defs.bzl
@@ -19,6 +19,8 @@ load("//rules/flags:flags.bzl", "flags")
 visibility(PROJECT_VISIBILITY)
 
 def define_flags():
+    """Defines rules_android feature flags."""
+
     flags.DEFINE_bool(
         name = "android_enable_res_v3",
         default = False,
diff --git a/rules/flags/flags.bzl b/rules/flags/flags.bzl
@@ -41,6 +41,8 @@ _IntFlagInfo = provider(
         value = "flag value",
     ),
 )
+
+# buildifier: disable=provider-params
 FlagsInfo = provider(
     doc = "Provides all flags",
 )
diff --git a/rules/instrumented_app_info_aspect.bzl b/rules/instrumented_app_info_aspect.bzl
@@ -18,7 +18,7 @@ load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
 
 visibility(PROJECT_VISIBILITY)
 
-def _impl(unused_target, ctx):
+def _impl(_target, ctx):
     if hasattr(ctx.rule.attr, "instruments") and ctx.rule.attr.instruments and AndroidIdeInfo in ctx.rule.attr.instruments:
         return [InstrumentedAppInfo(android_ide_info = ctx.rule.attr.instruments[AndroidIdeInfo])]
     return []
diff --git a/rules/java.bzl b/rules/java.bzl
diff --git a/rules/resources.bzl b/rules/resources.bzl
diff --git a/rules/utils.bzl b/rules/utils.bzl
diff --git a/src/tools/deploy_info/BUILD b/src/tools/deploy_info/BUILD
diff --git a/test/rules/android_binary/test.bzl b/test/rules/android_binary/test.bzl
diff --git a/test/rules/resources/test.bzl b/test/rules/resources/test.bzl
diff --git a/test/utils/asserts.bzl b/test/utils/asserts.bzl

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ InstrumentedAppInfo = provider(`
`125`	`125`	`)`
`126`	`126`
`127`	`127`	`FailureInfo = provider(`
	`128`	`+ doc = "Provides failure information.",`
`128`	`129`	`fields = dict(`
`129`	`130`	`error = "Error message",`
`130`	`131`	`),`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ android_feature_module = rule(`
`91`	`91`	`_skylark_testable = True,`
`92`	`92`	`)`
`93`	`93`
	`94`	`+# buildifier: disable=unnamed-macro`
`94`	`95`	`def get_feature_module_paths(fqn):`
`95`	`96`	`# Given a fqn to an android_feature_module, returns the absolute paths to`
`96`	`97`	`# all implicitly generated targets`