From 27109e76ac0bd30d29fef5042cac097c66f9082d Mon Sep 17 00:00:00 2001 From: Ted Date: Thu, 23 Jan 2025 16:03:43 -0800 Subject: [PATCH] Merge #330 by ted-xie: Use '/usr/bin/env bash' in android_sdk_repository Fixes #250 Closes #330 COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_android/pull/330 from ted-xie:bash 6aec908194a3de0d5849b39e7d0b522ba7e47ab8 PiperOrigin-RevId: 719047641 Change-Id: I3caca1f91d6d1602fbe4b78c3883a111fa5e144a --- .bazelci/presubmit.yml | 3 ++- rules/android_sdk_repository/helper.bzl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 6d6133e3..bc4e679a 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -4,7 +4,8 @@ matrix: bazel: [ 7.4.1, 8.0.0rc7, - last_green, +# Temporarily disabled until java_stub_template.txt is public +# last_green, ] tools_flags: &tools_flags diff --git a/rules/android_sdk_repository/helper.bzl b/rules/android_sdk_repository/helper.bzl index 514ef19e..ec1f8800 100644 --- a/rules/android_sdk_repository/helper.bzl +++ b/rules/android_sdk_repository/helper.bzl @@ -298,7 +298,7 @@ def create_android_sdk_rules( outs = [tool + "_runner.sh"], cmd = "\n".join([ "cat > $@ << 'EOF'", - "#!/bin/bash", + "#!/usr/bin/env bash", "set -eu", # The tools under build-tools/VERSION require the libraries under # build-tools/VERSION/lib, so we can't simply depend on them as a