diff options
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/BUILD | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index a12b2e356b..a6a411f787 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -18,7 +18,7 @@ PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto) LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") -GRPC_JAVA_VERSION=1.7.0 +GRPC_JAVA_VERSION=1.6.1 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ") GUAVA_VERSIONE=23.1 GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e .*${GUAVA_VERSION}.*jar | tr "\n" " ") diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD index 729cc26d02..c7d8cfb24f 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD @@ -293,22 +293,6 @@ java_test( ], ) -java_library( - name = "AbstractAndroidLocalTestTest", - srcs = ["AbstractAndroidLocalTestTest.java"], - deps = [ - "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-compilation", - "//src/main/java/com/google/devtools/build/lib:util", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/test/java/com/google/devtools/build/lib/actions:testutil", - "//src/test/java/com/google/devtools/build/lib/analysis/util", - "//third_party:guava", - "//third_party:junit", - "//third_party:truth", - ], -) - test_suite( name = "windows_tests", tags = [ |