diff options
| author |  cushon <cushon@google.com> | 2018-04-26 23:19:43 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-26 23:20:43 -0700 |
| commit | bdb75bba00dbe97e9bb99db04844096f135f59ad (patch) | |
| tree | 0cdbb28523715388e7117e0d1826d2b68d90d267 /src/java_tools/buildjar | |
| parent | 320aee817b938c0928369a875148031c5fd6867a (diff) | |
Use VanillaJavaBuilder for bootstrapping
PiperOrigin-RevId: 194504697
Diffstat (limited to 'src/java_tools/buildjar')
| -rw-r--r-- | src/java_tools/buildjar/BUILD | 9 | ||||
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD | 19 |
2 files changed, 1 insertions, 27 deletions
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index ab8aff6ab5..999e9b5b51 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -49,13 +49,6 @@ filegroup( ) filegroup( - name = "bootstrap_deploy.jar", - srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_deploy.jar"], - tags = ["manual"], - visibility = ["//visibility:public"], -) - -filegroup( name = "bootstrap_VanillaJavaBuilder_deploy.jar", srcs = ["//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:bootstrap_VanillaJavaBuilder_deploy.jar"], tags = ["manual"], @@ -89,7 +82,7 @@ java_toolchain( extclasspath = [], genclass = ["bootstrap_genclass_deploy.jar"], ijar = ["//third_party/ijar"], - javabuilder = ["bootstrap_deploy.jar"], + javabuilder = ["bootstrap_VanillaJavaBuilder_deploy.jar"], javac = ["//third_party/java/jdk/langtools:javac_jar"], jvm_opts = [ # Prevent "Could not reserve enough space for object heap" errors on Windows. diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD index a9c2790826..7d88f133ae 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD @@ -167,25 +167,6 @@ bootstrap_java_library( tags = ["manual"], ) -bootstrap_java_binary( - name = "bootstrap", - srcs = glob( - ["**/*.java"], - exclude = [ - "JarOwner.java", - "VanillaJavaBuilder.java", - "javac/testing/**", - ], - ), - main_class = "com.google.devtools.build.buildjar.BazelJavaBuilder", - tags = ["manual"], - deps = [ - ":skylark-deps", - "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:bootstrap_jarhelper", - "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:bootstrap_plugins", - ], -) - bootstrap_java_library( name = "bootstrap_JarOwner", srcs = ["JarOwner.java"], |