Don't soft-fail tests when ANDROID_HOME is not there

Author: Bencodes

tests/scripts/BUILD

@@ -43,9 +43,9 @@ script_test(
     name = "android_lint_aar_scenarios_test",
     size = "enormous",
     srcs = ["android_lint_aar_scenarios_test.sh"],
+    additional_env_inherit = ["ANDROID_HOME"],
     bazel_binaries = bazel_binaries,
     bazel_version = bazel_binaries.versions.current,
-    env_inherit = ["ANDROID_HOME"],
     tags = ["exclusive"],
     deps = [
         ":lint_helper",

tests/scripts/android_lint_aar_scenarios_test.sh

@@ -26,17 +26,7 @@ function set_up() {
   enable_android_in_workspace
 }
 
-# Skips the calling test when no Android SDK is available.
-function require_android_home() {
-  if [[ -z "${ANDROID_HOME:-}" ]]; then
-    echo "ANDROID_HOME is not set; skipping AAR scenario"
-    return 1
-  fi
-  return 0
-}
-
 function test_aar_embedded_lint_jar_flags_issue() {
-  require_android_home || return 0
   write_composable_annotation_stub
   write_dirty_composable
   write_fixture_aar
@@ -48,7 +38,6 @@ function test_aar_embedded_lint_jar_flags_issue() {
 }
 
 function test_aar_embedded_lint_jar_accepts_clean_composable() {
-  require_android_home || return 0
   write_composable_annotation_stub
   write_clean_composable
   write_fixture_aar