diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-02-19 13:18:11 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-02-19 13:18:11 +0000 |
| commit | bfcb7f340d5b9967bb381e27eb78728fae2ddada (patch) | |
| tree | e8641ebd9281b0c81b686be92b43d4206baede4b /compile.sh | |
| parent | d74f00132cd5d93a9d34a67dd29e31652e793e44 (diff) | |
Renamed java tools from //tools:java/* to //tools/jdk:* inside blaze.
--
MOS_MIGRATED_REVID=86681843
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compile.sh b/compile.sh index 08f5b1a4a3..87eb5b8ba9 100755 --- a/compile.sh +++ b/compile.sh @@ -311,8 +311,8 @@ if [ -z "${BAZEL_SKIP_SINGLEJAR_COMPILATION}" ]; then create_deploy_jar "SingleJar_deploy" \ "com.google.devtools.build.singlejar.SingleJar" "output/singlejar" - mkdir -p tools/java - cp -f output/singlejar/SingleJar_deploy.jar tools/java + mkdir -p tools/jdk + cp -f output/singlejar/SingleJar_deploy.jar tools/jdk fi if [ -z "${BAZEL_SKIP_BUILDJAR_COMPILATION}" ]; then @@ -322,8 +322,8 @@ if [ -z "${BAZEL_SKIP_BUILDJAR_COMPILATION}" ]; then create_deploy_jar "JavaBuilder_deploy" \ "com.google.devtools.build.buildjar.BazelJavaBuilder" "output/buildjar" - mkdir -p tools/java - cp -f output/buildjar/JavaBuilder_deploy.jar tools/java + mkdir -p tools/jdk + cp -f output/buildjar/JavaBuilder_deploy.jar tools/jdk fi function cc_compile() { @@ -372,7 +372,7 @@ function cc_build() { cc_build "client" "objs" "output/client" ${BLAZE_CC_FILES[@]} -LDFLAGS="$LDFLAGS -lz" cc_build "ijar" "ijar" "tools/java/ijar" ${IJAR_CC_FILES[@]} +LDFLAGS="$LDFLAGS -lz" cc_build "ijar" "ijar" "tools/jdk/ijar" ${IJAR_CC_FILES[@]} if [ ! -z "$JNILIB" ] ; then log "Compiling JNI libraries..." |