diff options
author | Klaus Aehlig <aehlig@google.com> | 2018-01-19 02:44:58 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-19 02:46:54 -0800 |
commit | 76eb2a4ef5747ef881f4a3d2d1e3338e4ef8913f (patch) | |
tree | 9929ddbfb99221a171cb4f2a7a8de6fd6ae271bd /scripts | |
parent | 3ac310e3c870cd70cef26354ee34b3708584db84 (diff) |
Partially revert fca3d391161ae4c92cf289a897db2a1c69a9b334
...as it breaks shell tests
Change-Id: I191ec7c0f36832ff064af0b756a8c8fb41eb2a87
PiperOrigin-RevId: 182509548
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/bootstrap/compile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index c7b26ccc72..3fbd6333a8 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -17,7 +17,7 @@ # Script for building bazel from scratch without bazel 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" " ") +LIBRARY_JARS=$(find third_party -name '*.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_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ") GUAVA_VERSION=23.1 |