diff options
| -rw-r--r-- | base_workspace/tools/BUILD | 6 | ||||
| -rw-r--r-- | base_workspace/tools/jdk/BUILD | 8 | ||||
| -rwxr-xr-x | compile.sh | 10 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/base_workspace/tools/BUILD b/base_workspace/tools/BUILD index be4acd3027..ffd0fb0cdc 100644 --- a/base_workspace/tools/BUILD +++ b/base_workspace/tools/BUILD @@ -1,7 +1 @@ package(default_visibility = ["//visibility:public"]) - -exports_files([ - "java/JavaBuilder_deploy.jar", - "java/ijar", - "java/SingleJar_deploy.jar", -]) diff --git a/base_workspace/tools/jdk/BUILD b/base_workspace/tools/jdk/BUILD index 7481bb37ad..89241c1aa5 100644 --- a/base_workspace/tools/jdk/BUILD +++ b/base_workspace/tools/jdk/BUILD @@ -49,7 +49,7 @@ filegroup(name = "jdk-null") filegroup( name = "jdk-default", - srcs = [":java"], + srcs = [":java"], path = "jdk/jre", ) @@ -67,3 +67,9 @@ java_toolchain( source_version = "8", target_version = "8", ) + +exports_files([ + "JavaBuilder_deploy.jar", + "ijar", + "SingleJar_deploy.jar", +]) 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..." diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java index f7ef0c714e..dbabc47832 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java @@ -43,10 +43,10 @@ public class JavaOptions extends FragmentOptions { // Defaults value for options static final String DEFAULT_LANGTOOLS_BOOTCLASSPATH = "//tools/jdk:bootclasspath"; static final String DEFAULT_LANGTOOLS = "//tools/jdk:langtools"; - static final String DEFAULT_JAVABUILDER = "//tools:java/JavaBuilder_deploy.jar"; - static final String DEFAULT_SINGLEJAR = "//tools:java/SingleJar_deploy.jar"; + static final String DEFAULT_JAVABUILDER = "//tools/jdk:JavaBuilder_deploy.jar"; + static final String DEFAULT_SINGLEJAR = "//tools/jdk:SingleJar_deploy.jar"; static final String DEFAULT_JAVABASE = "//tools/jdk:jdk"; - static final String DEFAULT_IJAR = "//tools:java/ijar"; + static final String DEFAULT_IJAR = "//tools/jdk:ijar"; static final String DEFAULT_TOOLCHAIN = "//tools/jdk:toolchain"; /** |