commit 5a2fdb123e4924b340cc19568f5fe39bf01e6ea4
author Alex Humesky <ahumesky@google.com> Mon Sep 28 22:45:16 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Tue Nov 10 15:57:22 2015 +0100
tree af326e58dba21586d394c18cdf9c4f2bb5141d24
parent fb61d5bcd571c23ff66a4a27751d6922381c49d1

Fixes Android integration tests by wiring up idlclass rules in integration
environment.

--
MOS_MIGRATED_REVID=104146030

src/test/shell/bazel/test-setup.sh

diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index d08484d..088ff6c 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -115,6 +115,12 @@
 )
 
 sh_binary(
+    name = "IdlClass",
+    srcs = ["idlclass.sh"],
+    data = ["//src/tools/android/java/com/google/devtools/build/android/idlclass:IdlClass"],
+)
+
+sh_binary(
     name = "merge_manifests",
     srcs = ["fail.sh"],
 )
@@ -183,8 +189,8 @@
 
   chmod +x third_party/java/jarjar/fail.sh
 
-  mkdir -p src/tools/android/java/com/google/devtools/build/android/idlclass
-  cat > src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD <<EOF
+  mkdir -p ${ANDROID_TOOLS}/src/tools/android/java/com/google/devtools/build/android/idlclass
+  cat > ${ANDROID_TOOLS}/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD <<EOF
 licenses(["unencumbered"])
 sh_binary(
   name = "IdlClass",
@@ -193,14 +199,14 @@
 )
 EOF
 
-  cat > src/tools/android/java/com/google/devtools/build/android/idlclass/fail.sh <<EOF
+  cat > ${ANDROID_TOOLS}/src/tools/android/java/com/google/devtools/build/android/idlclass/fail.sh <<EOF
 
 #!/bin/bash
 
 exit 1
 EOF
 
-  chmod +x src/tools/android/java/com/google/devtools/build/android/idlclass/fail.sh
+  chmod +x ${ANDROID_TOOLS}/src/tools/android/java/com/google/devtools/build/android/idlclass/fail.sh
 
   ANDROID_NDK=$PWD/android_ndk
   ANDROID_SDK=$PWD/android_sdk