Make Android rules/tests refer to the correct runfiles paths

Fixes the android part of #1316.

--
MOS_MIGRATED_REVID=123644129

4 files changed, 5 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java
index f91c973ba5..7285c056bf 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryFunction.java
@@ -86,7 +86,6 @@ public class AndroidSdkRepositoryFunction extends RepositoryFunction {
     String template = getStringResource("android_sdk_repository_template.txt");
 
     String buildFile = template
-        .replaceAll("%workspace_name%", rule.getWorkspaceName())
         .replaceAll("%repository_name%", rule.getName())
         .replaceAll("%build_tools_version%", buildToolsVersion)
         .replaceAll("%build_tools_directory%", buildToolsDirectory)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
index f6317cfaf7..e82b5e4c16 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt
@@ -7,5 +7,4 @@ create_android_sdk_rules(
     build_tools_version = "%build_tools_version%",
     build_tools_directory = "%build_tools_directory%",
     api_level = %api_level%,
-    workspace_name = "%workspace_name%",
 )
diff --git a/src/test/shell/bazel/android/android_integration_test.sh b/src/test/shell/bazel/android/android_integration_test.sh
index 7d3dd34f4f..5efbcca37d 100755
--- a/src/test/shell/bazel/android/android_integration_test.sh
+++ b/src/test/shell/bazel/android/android_integration_test.sh
@@ -205,15 +205,15 @@ function test_android_binary_clang() {
 }
 
 # ndk r10 and earlier
-if [[ ! -r "${BAZEL_RUNFILES}/external/androidndk/ndk/RELEASE.TXT" ]]; then
+if [[ ! -r "${TEST_SRCDIR}/androidndk/ndk/RELEASE.TXT" ]]; then
   # ndk r11 and later
-  if [[ ! -r "${BAZEL_RUNFILES}/external/androidndk/ndk/source.properties" ]]; then
+  if [[ ! -r "${TEST_SRCDIR}/androidndk/ndk/source.properties" ]]; then
     echo "Not running Android tests due to lack of an Android NDK."
     exit 0
   fi
 fi
 
-if [[ ! -r "${BAZEL_RUNFILES}/external/androidsdk/SDK Readme.txt" ]]; then
+if [[ ! -r "${TEST_SRCDIR}/androidsdk/SDK Readme.txt" ]]; then
   echo "Not running Android tests due to lack of an Android SDK."
   exit 0
 fi
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index a8b0e77bd1..05f265f33c 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -66,8 +66,8 @@ function setup_android_support() {
   # TODO(bazel-team): This hard-codes the name of the Android repository in
   # the WORKSPACE file of Bazel. Change this once external repositories have
   # their own defined names under which they are mounted.
-  NDK_SRCDIR=$BAZEL_RUNFILES/external/androidndk/ndk
-  SDK_SRCDIR=$BAZEL_RUNFILES/external/androidsdk
+  NDK_SRCDIR=$TEST_SRCDIR/androidndk/ndk
+  SDK_SRCDIR=$TEST_SRCDIR/androidsdk
 
   mkdir -p $ANDROID_NDK
   mkdir -p $ANDROID_SDK