diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2017-03-02 16:13:50 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-03 10:35:54 +0000 |
| commit | c3102b722af6fba2a67fdfed55426471c0927ab8 (patch) | |
| tree | c97d1b3aeea4b3cb513c9b9e03a56302dc60b9d9 /scripts/bootstrap | |
| parent | cffe73585e3c734638414af62e98ec9466a5638c (diff) | |
Rollback of commit 55b20c4a50642d8f1ac11cb721ecd5831f02dd76.
*** Reason for rollback ***
Broke JDK7 tests
*** Original change description ***
Code clean-up
--
PiperOrigin-RevId: 149005807
MOS_MIGRATED_REVID=149005807
Diffstat (limited to 'scripts/bootstrap')
| -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 ec7156937d..95b59d3556 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 /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") +LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") GRPC_JAVA_VERSION=0.15.0 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ") LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}" |