Make path attribute optional for android_sdk_repository and android_ndk_repository.

Read from ANDROID_{NDK_}HOME if not set. Note that the repository is NOT invalidated if ANDROID_{NDK_}HOME is changed. Once https://bazel.build/designs/2016/10/18/repository-invalidation.htm is implemented, that will no longer be the case.

This is one piece of https://github.com/bazelbuild/bazel/issues/2284.

RELNOTES: android_sdk_repository and android_ndk_repository now read $ANDROID_HOME and $ANDROID_NDK_HOME if the path attribute is not set.

--
PiperOrigin-RevId: 143686964
MOS_MIGRATED_REVID=143686964

1 files changed, 56 insertions, 0 deletions

diff --git a/src/test/shell/bazel/android/android_integration_test.sh b/src/test/shell/bazel/android/android_integration_test.sh
index a8086aa8b7..8cb626eecb 100755
--- a/src/test/shell/bazel/android/android_integration_test.sh
+++ b/src/test/shell/bazel/android/android_integration_test.sh
@@ -312,6 +312,62 @@ EOF
   assert_contains "build_tools_version = \"25.0.1\"" output
 }
 
+function test_android_sdk_repository_path_from_environment() {
+  create_new_workspace
+  setup_android_support
+  # Overwrite WORKSPACE that was created by setup_android_support with one that
+  # does not set the path attribute of android_sdk_repository.
+  cat > WORKSPACE <<EOF
+android_sdk_repository(
+    name = "androidsdk",
+    api_level = 25,
+)
+EOF
+  ANDROID_HOME=$ANDROID_SDK bazel build @androidsdk//:files || fail \
+    "android_sdk_repository failed to build with \$ANDROID_HOME instead of " \
+    "path"
+}
+
+function test_android_ndk_repository_path_from_environment() {
+  create_new_workspace
+  setup_android_support
+  cat > WORKSPACE <<EOF
+android_ndk_repository(
+    name = "androidndk",
+    api_level = 25,
+)
+EOF
+  ANDROID_NDK_HOME=$ANDROID_NDK bazel build @androidndk//:files || fail \
+    "android_ndk_repository failed to build with \$ANDROID_NDK_HOME instead " \
+    "of path"
+}
+
+function test_android_sdk_repository_no_path_or_android_home() {
+  create_new_workspace
+  setup_android_support
+  cat > WORKSPACE <<EOF
+android_sdk_repository(
+    name = "androidsdk",
+    api_level = 25,
+)
+EOF
+  bazel build @androidsdk//:files >& $TEST_log && fail "Should have failed"
+  expect_log "Either the path attribute of android_sdk_repository"
+}
+
+function test_android_ndk_repository_no_path_or_android_ndk_home() {
+  create_new_workspace
+  setup_android_support
+  cat > WORKSPACE <<EOF
+android_ndk_repository(
+    name = "androidndk",
+    api_level = 25,
+)
+EOF
+  bazel build @androidndk//:files >& $TEST_log && fail "Should have failed"
+  expect_log "Either the path attribute of android_ndk_repository"
+}
+
 # ndk r10 and earlier
 if [[ ! -r "${TEST_SRCDIR}/androidndk/ndk/RELEASE.TXT" ]]; then
   # ndk r11 and later