Fix paths in Android scripts to always look under bazel_tools

Fixes #1214.

--
MOS_MIGRATED_REVID=121416417

6 files changed, 7 insertions, 36 deletions

diff --git a/tools/android/aar_generator.sh b/tools/android/aar_generator.sh
index 62f6239d53..1525733903 100755
--- a/tools/android/aar_generator.sh
+++ b/tools/android/aar_generator.sh
@@ -12,9 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if echo $0 | grep -sq /external/; then
-  PREFIX="external/$(echo $0 | sed 's_^.*external/\([^/]*\)/.*$_\1_')"
-else
-  PREFIX=""
-fi
-exec ${TEST_SRCDIR-$0.runfiles}/$PREFIX/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction "$@"
+
+exec ${TEST_SRCDIR-$0.runfiles}/bazel_tools/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction "$@"
diff --git a/tools/android/idlclass.sh b/tools/android/idlclass.sh
index f6e5449a21..442c59c186 100755
--- a/tools/android/idlclass.sh
+++ b/tools/android/idlclass.sh
@@ -12,10 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if echo $0 | grep -sq /external/; then
-  PREFIX="external/$(echo $0 | sed 's_^.*external/\([^/]*\)/.*$_\1_')"
-else
-  PREFIX=""
-fi
 JAVA_PACKAGE=com/google/devtools/build/android/idlclass
-exec ${TEST_SRCDIR-$0.runfiles}/$PREFIX/src/tools/android/java/${JAVA_PACKAGE}/IdlClass "$@"
+exec ${TEST_SRCDIR-$0.runfiles}/bazel_tools/src/tools/android/java/${JAVA_PACKAGE}/IdlClass "$@"
diff --git a/tools/android/merge_dexzips.sh b/tools/android/merge_dexzips.sh
index a29a95df91..2dd6a4cd0d 100755
--- a/tools/android/merge_dexzips.sh
+++ b/tools/android/merge_dexzips.sh
@@ -12,10 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if echo $0 | grep -sq /external/; then
-  PREFIX="external/$(echo $0 | sed 's_^.*external/\([^/]*\)/.*$_\1_')"
-else
-  PREFIX=""
-fi
 JAVA_PACKAGE=com/google/devtools/build/android/ziputils
-exec ${TEST_SRCDIR-$0.runfiles}/$PREFIX/src/tools/android/java/${JAVA_PACKAGE}/reducer "$@"
+exec ${TEST_SRCDIR-$0.runfiles}/bazel_tools/src/tools/android/java/${JAVA_PACKAGE}/reducer "$@"
diff --git a/tools/android/resource_shrinker.sh b/tools/android/resource_shrinker.sh
index bcfa97e16b..8174185ba5 100755
--- a/tools/android/resource_shrinker.sh
+++ b/tools/android/resource_shrinker.sh
@@ -12,10 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if echo $0 | grep -sq /external/; then
-  PREFIX="external/$(echo $0 | sed 's_^.*external/\([^/]*\)/.*$_\1_')"
-else
-  PREFIX=""
-fi
 
-exec "${TEST_SRCDIR-$0.runfiles}/$PREFIX/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction" "$@"
+exec "${TEST_SRCDIR-$0.runfiles}/bazel_tools/src/tools/android/java/com/google/devtools/build/android/ResourceShrinkerAction" "$@"
diff --git a/tools/android/resources_processor.sh b/tools/android/resources_processor.sh
index 59db4e57b9..a5998e6db9 100755
--- a/tools/android/resources_processor.sh
+++ b/tools/android/resources_processor.sh
@@ -12,10 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if echo $0 | grep -sq /external/; then
-  PREFIX="external/$(echo $0 | sed 's_^.*external/\([^/]*\)/.*$_\1_')"
-else
-  PREFIX=""
-fi
 
-exec ${TEST_SRCDIR-$0.runfiles}/$PREFIX/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction "$@"
+exec ${TEST_SRCDIR-$0.runfiles}/bazel_tools/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction "$@"
diff --git a/tools/android/shuffle_jars.sh b/tools/android/shuffle_jars.sh
index b627490d76..37af32d7d5 100755
--- a/tools/android/shuffle_jars.sh
+++ b/tools/android/shuffle_jars.sh
@@ -12,10 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if echo $0 | grep -sq /external/; then
-  PREFIX="external/$(echo $0 | sed 's_^.*external/\([^/]*\)/.*$_\1_')"
-else
-  PREFIX=""
-fi
 JAVA_PACKAGE=com/google/devtools/build/android/ziputils
-exec ${TEST_SRCDIR-$0.runfiles}/$PREFIX/src/tools/android/java/${JAVA_PACKAGE}/mapper "$@"
+exec ${TEST_SRCDIR-$0.runfiles}/bazel_tools/src/tools/android/java/${JAVA_PACKAGE}/mapper "$@"