Rollback of commit 6cb8d820689ad029a9d0dc4ee1100db9b2d96515.

*** Reason for rollback ***

Breaks ci.bazel.io

While the basics for fixing the build is easy (just a few typos in packages building), fixing the test is a bit more tricky. I see only one solution for fixing the test: use a select statement that would select the good bazel version but that would always pull JavaBuilder as an external dependency when we do test.

Better roll this back then check the JavaBuilder 0.1.0 as a binary in third_party before rolling forward (a similar change is still needed to decouple running the test and building the binary for JDK 7)

*** Original change description ***


Refactor build for JDK 7

Now the JDK 7 tuning happens all in Bazel, removing logic
from the CI script. It uses remote repositories to access
JDK 7 dependencies.

--
MOS_MIGRATED_REVID=119773123

2 files changed, 13 insertions, 57 deletions

diff --git a/src/BUILD b/src/BUILD
index 07cd4fd63f..7ff67d458f 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -38,7 +38,6 @@ filegroup(
     }),
 ) for suffix, embedded_tools in {
     "": [":embedded_tools"],
-    "-jdk7": [":embedded_tools-jdk7"],
     "_notools": [],
 }.items()]
 
@@ -88,32 +87,25 @@ filegroup(
     }),
 )
 
-filegroup(
-    name = "common_embedded_tools",
+genrule(
+    name = "embedded_tools",
     srcs = [
-        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
+        ":create_embedded_tools.sh",
+        "//tools:embedded_tools_srcs",
+        "//third_party:embedded_tools_srcs",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
-        "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
-        "//src/java_tools/singlejar:SingleJar_deploy.jar",
-        "//src/main/protobuf:srcs",
         "//src/tools/android/java/com/google/devtools/build/android:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/ideinfo:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/idlclass:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:srcs",
         "//src/tools/android/java/com/google/devtools/build/android/ziputils:embedded_tools",
-        "//third_party:embedded_tools_srcs",
+        "//src/main/protobuf:srcs",
+        "//src/java_tools/buildjar:JavaBuilder_deploy.jar",
+        "//src/java_tools/singlejar:SingleJar_deploy.jar",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
+        "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
         "//third_party/ijar",
         "//third_party/java/apkbuilder:embedded_tools",
-        "//tools:embedded_tools_srcs",
-    ],
-)
-
-genrule(
-    name = "embedded_tools",
-    srcs = [
-        ":create_embedded_tools.sh",
-        ":common_embedded_tools",
-        "//src/java_tools/buildjar:JavaBuilder_deploy.jar",
     ] + select({
         ":darwin": [
             ":darwin_tools",
@@ -130,40 +122,9 @@ genrule(
     cmd = "$(location :create_embedded_tools.sh) $@ $(SRCS)",
 )
 
-genrule(
-    name = "tools_jdk_jdk7_build",
-    srcs = ["//tools/jdk:BUILD"],
-    outs = ["tools_jdk_jdk7.build"],
-    cmd = "cat $< | sed 's|\"toolchain\"|\"toolchain8\"|' | sed 's|\"toolchain7\"|\"toolchain\"|' > $@",
-)
-
-genrule(
-    name = "embedded_tools-jdk7",
-    srcs = [
-        ":create_embedded_tools.sh",
-        ":common_embedded_tools",
-        "@io_bazel_javabuilder_jdk7//file",
-        "@io_bazel_javac_jdk7//file",
-        ":tools_jdk_jdk7_build",
-    ] + select({
-        ":darwin": [
-            ":darwin_tools",
-            "//third_party/ijar:zipper",
-        ],
-        ":darwin_x86_64": [
-            ":darwin_tools",
-            "//third_party/ijar:zipper",
-        ],
-        ":windows": [],  # Windows specifically exclude zipper for now.
-        "//conditions:default": ["//third_party/ijar:zipper"],
-    }),
-    outs = ["embedded_tools-jdk7.zip"],
-    cmd = "$(location :create_embedded_tools.sh) $@ $(SRCS)",
-)
-
 [genrule(
     name = "package-zip" + suffix,
-    srcs = ([":embedded_%s.zip" % embed] if embed else []) + [
+    srcs = ([":embedded_tools.zip"] if embed else []) + [
         # The script assumes that the embedded tools zip (if exists) is the
         # first item here, the deploy jar the second and install base key is the
         # third
@@ -183,9 +144,8 @@ genrule(
     cmd = "$(location :package-bazel.sh) $@ " + ("" if embed else "''") + " $(SRCS)",
     tools = ["package-bazel.sh"],
 ) for suffix, embed in [
-    ("", "tools"),
-    ("_notools", None),
-    ("-jdk7", "tools-jdk7"),
+    ("", True),
+    ("_notools", False),
 ]]
 
 [genrule(
@@ -206,7 +166,6 @@ genrule(
 ) for suffix in [
     "",
     "_notools",
-    "-jdk7",
 ]]
 
 # Build an executable named `bazel.exe`.
@@ -227,7 +186,6 @@ genrule(
 ) for suffix in [
     "",
     "_notools",
-    "-jdk7",
 ]]
 
 config_setting(
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 78bd9e4afb..e3b751c3b0 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -28,8 +28,6 @@ trap "rm -fr \"${PACKAGE_DIR}\"" EXIT
 
 for i in $*; do
   case "$i" in
-    *javac.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac.jar ;;
-    *tools_jdk_jdk7.build) OUTPUT_PATH=tools/jdk/BUILD ;;
     *JavaBuilder_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;;
     *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;;
     *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;;