Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kokoro/presubmit/kokoro_presubmit.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Copyright 2022 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion kokoro/presubmit/presubmit_main.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Copyright 2023 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
3 changes: 3 additions & 0 deletions mobile_install/apks.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def _compile_android_manifest(ctx, manifest, resources_zip, out_manifest):
args.add("-force_debuggable", compilation_mode.get(ctx) != compilation_mode.OPT)

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["manifest", args],
tools = [ctx.executable._aapt2],
Expand All @@ -52,6 +53,7 @@ def _patch_split_manifests(ctx, orig_manifest, split_manifests, out_manifest_pac
args.add("-pkg", out_manifest_package_name)

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["patch", args],
inputs = [orig_manifest],
Expand Down Expand Up @@ -79,6 +81,7 @@ def _make_split_apk(ctx, dirs, artifacts, debug_signing_keys, debug_signing_line
args.add_joined("-dir", dir_paths.keys(), join_with = ",")

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["repack", args],
inputs = inputs,
Expand Down
1 change: 1 addition & 0 deletions mobile_install/deploy_info.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def make_deploy_info_pb(ctx, manifest, apks):
args.add("--deploy_info", deploy_info_pb)

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._deploy_info,
arguments = [args],
outputs = [deploy_info_pb],
Expand Down
2 changes: 1 addition & 1 deletion mobile_install/launcher_direct.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ load(":utils.bzl", "utils")

visibility(PROJECT_VISIBILITY)

_DEPLOY_SCRIPT = '''#!/bin/bash
_DEPLOY_SCRIPT = '''#!/usr/bin/env bash
set -e # exit on failure
umask 022 # set default file/dir creation mode to 755

Expand Down
1 change: 1 addition & 0 deletions mobile_install/native_libs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def make_native_libs_zip(ctx, native_libs, aar_native_libs, sibling, arch = None
args.add("-out", native_zip)
args.add("-architecture", arch)
ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["nativelib", args],
inputs = depset(transitive = inputs),
Expand Down
3 changes: 2 additions & 1 deletion mobile_install/r_java.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.
"""Methods to create and process R.java."""

load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load(":utils.bzl", "utils")

visibility(PROJECT_VISIBILITY)
Expand Down Expand Up @@ -83,6 +83,7 @@ def _make_r_jar(ctx, r_java, packages, out_r_jar):

# Call action binary.
ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = [rjar_args],
tools = ctx.attr._jar_tool[DefaultInfo].files,
Expand Down
6 changes: 6 additions & 0 deletions mobile_install/resources.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ def _bucketize_resources(ctx, data):
args.add_joined("-res_paths", data[res_dir], join_with = ",")

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["bucketize", args],
inputs = data[res_dir],
Expand Down Expand Up @@ -191,6 +192,7 @@ def _compile_bucketized_resources(ctx, data):
sibling = res_bucket,
)
ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = [
"compile",
Expand Down Expand Up @@ -241,6 +243,7 @@ def _compile_library_resouces(ctx, data):
args.add("-in", res_dir)
args.add("-out", out)
ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["compile", args],
inputs = data[res_type][res_dir] + ctx.attr._aapt2[DefaultInfo].files.to_list(),
Expand Down Expand Up @@ -290,6 +293,7 @@ def link_resources(
args.add_joined("-asset_dirs", assets_dirs, join_with = ",")

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["link", args],
inputs = depset(
Expand Down Expand Up @@ -323,6 +327,7 @@ def liteparse(ctx):
args.add("--out", r_pb)

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["liteparse", args],
inputs = ctx.rule.files.resource_files,
Expand All @@ -349,6 +354,7 @@ def compiletime_r_srcjar(ctx, output_srcjar, r_pbs, package):
args.add_joined("-resourcePbs", r_pbs, join_with = ",")

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["rstub", args],
inputs = r_pbs,
Expand Down
9 changes: 6 additions & 3 deletions mobile_install/utils.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@
# limitations under the License.
"""Utilities for by the Mobile-Install aspect."""

load("@rules_java//java/common:java_common.bzl", "java_common")
load("//rules:min_sdk_version.bzl", _min_sdk_version = "min_sdk_version")
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("//rules/flags:flags.bzl", "flags")
load("@rules_java//java/common:java_common.bzl", "java_common")

# Copybara: placeholder for GeneratedExtensionRegistryInfo load
load("//tools/jdk:jvmopts.bzl", "BASE_JVMOPTS")
load(":constants.bzl", "constants")

visibility(PROJECT_VISIBILITY)

_PACKAGE_NAME_EXTRACTION_SCRIPT = """
#!/bin/bash
#!/usr/bin/env bash
set -e # exit on failure
umask 022 # set default file/dir creation mode to 755

Expand Down Expand Up @@ -185,6 +186,7 @@ def dex(ctx, jar, out_dex_shards, deps = None):
]

ctx.actions.run(
use_default_shell_env = True,
executable = java,
tools = [ctx.executable._desugar_dex_sharding],
arguments = jvm_flags + ["-jar", ctx.executable._desugar_dex_sharding.path, args],
Expand Down Expand Up @@ -273,14 +275,14 @@ def merge_dex_shards(
"""
args = ctx.actions.args()


args.add("--multidex", "best_effort")
args.add("--output", out_dex_zip.path)
args.add_all(dex_archives, before_each = "--input")
args.use_param_file(param_file_arg = "@%s", use_always = True)
args.set_param_file_format("multiline")

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._dexmerger,
arguments = [args],
tools = [],
Expand All @@ -307,6 +309,7 @@ def strip_r(ctx, jar, out_jar):
args.add("-out", out_jar)

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._android_kit,
arguments = ["repack", args],
inputs = [jar],
Expand Down
2 changes: 2 additions & 0 deletions rules/aapt.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def _convert(
args.add(input)

ctx.actions.run(
use_default_shell_env = True,
executable = aapt,
arguments = [args],
inputs = [input],
Expand Down Expand Up @@ -210,6 +211,7 @@ echo $(tac $1) > $2
args.add("-o", out_resource_apk)

ctx.actions.run(
use_default_shell_env = True,
executable = aapt,
arguments = [args],
inputs = depset(
Expand Down
12 changes: 9 additions & 3 deletions rules/aar_import/impl.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# limitations under the License.
"""Implementation."""

load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:proguard_spec_info.bzl", "ProguardSpecInfo")
load("//providers:providers.bzl", "AndroidLintRulesInfo", "AndroidNativeLibsInfo")
load(
"//rules:acls.bzl",
Expand All @@ -39,9 +42,6 @@ load(
_utils = "utils",
)
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:proguard_spec_info.bzl", "ProguardSpecInfo")

visibility(PROJECT_VISIBILITY)

Expand Down Expand Up @@ -102,6 +102,7 @@ def _extract_resources(
args.add("--output_res_dir", out_resources_dir.path)
args.add("--output_assets_dir", out_assets_dir.path)
ctx.actions.run(
use_default_shell_env = True,
executable = aar_resources_extractor_tool,
arguments = [args],
inputs = [aar],
Expand All @@ -122,6 +123,7 @@ def _extract_native_libs(
args.add("--cpu", cpu)
args.add("--output_zip", output_zip)
ctx.actions.run(
use_default_shell_env = True,
executable = aar_native_libs_zip_creator_tool,
arguments = [args],
inputs = [aar],
Expand Down Expand Up @@ -195,6 +197,7 @@ def _extract_jars(
args.add("--build_target", ctx.label)
args.add("--output_singlejar_param_file", out_jars_params_file)
ctx.actions.run(
use_default_shell_env = True,
executable = aar_embedded_jars_extractor_tool,
arguments = [args],
inputs = [aar],
Expand All @@ -216,6 +219,7 @@ def _merge_jars(
args.add("--normalize")
args.add("@" + jars_param_file.path)
ctx.actions.run(
use_default_shell_env = True,
executable = single_jar_tool,
arguments = [args],
inputs = [jars_tree_artifact, jars_param_file],
Expand Down Expand Up @@ -388,6 +392,7 @@ def _validate_rule(
args.add("-output", validation_output)

ctx.actions.run(
use_default_shell_env = True,
executable = checks,
arguments = [args],
inputs = [aar, manifest],
Expand Down Expand Up @@ -437,6 +442,7 @@ def _collect_proguard(
args.add("--input_aar", aar)
args.add("--output_proguard_file", out_proguard)
ctx.actions.run(
use_default_shell_env = True,
executable = aar_embedded_proguard_extractor,
arguments = [args],
inputs = [aar],
Expand Down
5 changes: 4 additions & 1 deletion rules/android_application/android_application_rule.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
"""android_application rule."""

load("@rules_java//java/common:java_common.bzl", "java_common")
load(
"//providers:providers.bzl",
"AndroidArchivedSandboxedSdkInfo",
Expand Down Expand Up @@ -60,7 +61,6 @@ load(
_log = "log",
)
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_common.bzl", "java_common")
load(":android_feature_module_rule.bzl", "get_feature_module_paths")
load(":attrs.bzl", "ANDROID_APPLICATION_ATTRS")

Expand Down Expand Up @@ -203,6 +203,7 @@ def _create_feature_manifest(
args.add(aapt2.executable)

ctx.actions.run(
use_default_shell_env = True,
executable = feature_manifest_script,
inputs = [base_apk],
outputs = [manifest],
Expand Down Expand Up @@ -232,6 +233,7 @@ def _create_feature_manifest(
args.add(is_asset_pack)

ctx.actions.run(
use_default_shell_env = True,
executable = priority_feature_manifest_script,
inputs = [base_apk, info.manifest],
outputs = [priority_manifest],
Expand All @@ -252,6 +254,7 @@ def _create_feature_manifest(
if is_asset_pack:
args.add("--is_asset_pack")
ctx.actions.run(
use_default_shell_env = True,
executable = ctx.attr._merge_manifests.files_to_run,
inputs = [priority_manifest, info.manifest],
outputs = [manifest],
Expand Down
1 change: 1 addition & 0 deletions rules/android_application/android_feature_module_rule.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def _impl(ctx):
args.add(ctx.attr.is_asset_pack)

ctx.actions.run(
use_default_shell_env = True,
executable = ctx.executable._feature_module_validation_script,
inputs = inputs,
outputs = [validation],
Expand Down
2 changes: 1 addition & 1 deletion rules/android_application/bundle_deploy.sh_template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash --posix
#!/usr/bin/env bash --posix

java_executable="%java_executable%"
bundletool="%bundletool_path%"
Expand Down
2 changes: 1 addition & 1 deletion rules/android_application/feature_module_validation.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash --posix
#!/usr/bin/env bash --posix
# Copyright 2021 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion rules/android_application/gen_android_feature_manifest.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash --posix
#!/usr/bin/env bash --posix
# Copyright 2021 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash --posix
#!/usr/bin/env bash --posix
# Copyright 2021 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 2 additions & 0 deletions rules/android_binary/r8.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def process_resource_shrinking_r8(ctx, r8_ctx, packaged_resources_ctx, **_unused
# 1. Convert the resource APK to proto format (resource shrinker operates on a proto apk)
proto_resource_apk = ctx.actions.declare_file(ctx.label.name + "_proto_resource_apk.ap_")
ctx.actions.run(
use_default_shell_env = True,
arguments = [ctx.actions.args()
.add("convert")
.add(packaged_resources_ctx.resources_apk) # input apk
Expand Down Expand Up @@ -192,6 +193,7 @@ def process_resource_shrinking_r8(ctx, r8_ctx, packaged_resources_ctx, **_unused
# 3. Convert back to a binary APK
resource_apk_shrunk = ctx.actions.declare_file(ctx.label.name + "_resource_apk_shrunk.ap_")
ctx.actions.run(
use_default_shell_env = True,
arguments = [ctx.actions.args()
.add("convert")
.add(proto_resource_apk_shrunk) # input apk
Expand Down
9 changes: 5 additions & 4 deletions rules/android_local_test/impl.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
# limitations under the License.
"""Bazel rule for Android local test."""

load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
load("//providers:providers.bzl", "AndroidFilteredJdepsInfo")
load("//rules:attrs.bzl", "attrs")
load("//rules:common.bzl", "common")
Expand All @@ -34,10 +38,6 @@ load(
"utils",
)
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")

visibility(PROJECT_VISIBILITY)

Expand Down Expand Up @@ -561,6 +561,7 @@ def filter_jdeps(ctx, in_jdeps, out_jdeps, filter_suffix):
args.add("--out")
args.add(out_jdeps.path)
ctx.actions.run(
use_default_shell_env = True,
inputs = [in_jdeps],
outputs = [out_jdeps],
executable = get_android_toolchain(ctx).jdeps_tool.files_to_run,
Expand Down
Loading