Rollback of commit e4133aab4db7cd640501d1113c259e8477006b6f.

*** Reason for rollback ***

Broke build of Bazel tests on ci.bazel.io
See http://ci.bazel.io/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=ubuntu_15.10-x86_64/280/console

Found using git bisect and /tmp/bazel-bin build --nobuild //src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:workspace

*** Original change description ***

Factor implementation of bazel-specific cpp logic out of devtools/build/lib/BUILD into subpackage, to allow the objc implementation to extend that logic without a circular dependency.  In particular, create a subpackage at lib/bazel/rules, and move relevant targets that were in lib/bazel down to the subpackage.

--
MOS_MIGRATED_REVID=111632586

5 files changed, 52 insertions, 141 deletions

diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD
index d65a47146e..68cfd2e24e 100644
--- a/src/main/java/com/google/devtools/build/docgen/BUILD
+++ b/src/main/java/com/google/devtools/build/docgen/BUILD
@@ -25,9 +25,9 @@ java_binary(
     main_class = "com.google.devtools.build.docgen.BuildEncyclopediaGenerator",
     deps = [
         ":docgen_javalib",
+        "//src/main/java/com/google/devtools/build/lib:bazel-rules",
         "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-rules",
     ],
 )
 
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index c5ec7b1e9c..e84a40baa3 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -460,16 +460,65 @@ java_library(
 )
 
 java_library(
+    name = "bazel-rules",
+    srcs = glob(
+        [
+            "bazel/rules/**/*.java",
+        ],
+        exclude = [
+            "bazel/rules/workspace/*.java",
+        ],
+    ),
+    resources = glob(
+        [
+            "bazel/rules/**/*.txt",
+            "bazel/rules/**/*.WORKSPACE",
+        ],
+    ),
+    deps = [
+        ":android-rules",
+        ":bazel",
+        ":bazel-repository",
+        ":build-base",
+        ":build-info",
+        ":collect",
+        ":common",
+        ":events",
+        ":ideinfo",
+        ":java-rules",
+        ":packages-internal",
+        ":proto-rules",
+        ":python-rules",
+        ":skylarkinterface",
+        ":util",
+        ":vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/lib/query2:query-output",
+        "//src/main/java/com/google/devtools/build/lib/rules/apple",
+        "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+        "//src/main/java/com/google/devtools/build/lib/rules/genquery",
+        "//src/main/java/com/google/devtools/build/lib/rules/objc",
+        "//src/main/java/com/google/devtools/build/skyframe",
+        "//src/main/java/com/google/devtools/common/options",
+        "//src/main/protobuf:crosstool_config_proto",
+        "//third_party:guava",
+        "//third_party:joda_time",
+        "//third_party:jsr305",
+    ],
+)
+
+java_library(
     name = "bazel-main",
     srcs = glob(["bazel/*.java"]),
     resources = [
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:java/java_stub_template.txt",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:python/stub_template.txt",
+        "bazel/rules/java/java_stub_template.txt",
+        "bazel/rules/python/stub_template.txt",
     ],
     deps = [
         ":bazel",
         ":bazel-commands",
         ":bazel-repository",
+        ":bazel-rules",
         ":build-base",
         ":build-info",
         ":clock",
@@ -481,8 +530,6 @@ java_library(
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/bazel/dash",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-rules",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:workspace",
         "//src/main/java/com/google/devtools/build/lib/sandbox",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/build/lib/worker",
@@ -542,7 +589,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:vfs",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:workspace",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//third_party:aether",
         "//third_party:apache_commons_compress",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD
deleted file mode 100644
index fa9a9231f5..0000000000
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-package(
-    default_visibility = ["//src:__subpackages__"],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(
-    [
-        "java/java_stub_template.txt",
-        "python/stub_template.txt",
-    ],
-)
-
-java_library(
-    name = "bazel-rules",
-    srcs = glob(
-        [
-            "**/*.java",
-        ],
-        exclude = [
-            "cpp/*.java",
-            "workspace/*.java",
-        ],
-    ),
-    resources = glob(
-        [
-            "**/*.txt",
-            "**/*.WORKSPACE",
-        ],
-    ),
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib:android-rules",
-        "//src/main/java/com/google/devtools/build/lib:bazel",
-        "//src/main/java/com/google/devtools/build/lib:build-base",
-        "//src/main/java/com/google/devtools/build/lib:build-info",
-        "//src/main/java/com/google/devtools/build/lib:collect",
-        "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib:events",
-        "//src/main/java/com/google/devtools/build/lib:ideinfo",
-        "//src/main/java/com/google/devtools/build/lib:java-rules",
-        "//src/main/java/com/google/devtools/build/lib:packages-internal",
-        "//src/main/java/com/google/devtools/build/lib:proto-rules",
-        "//src/main/java/com/google/devtools/build/lib:python-rules",
-        "//src/main/java/com/google/devtools/build/lib:util",
-        "//src/main/java/com/google/devtools/build/lib:vfs",
-        "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:workspace",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp:cpp-rules",
-        "//src/main/java/com/google/devtools/build/lib/query2:query-output",
-        "//src/main/java/com/google/devtools/build/lib/rules/apple",
-        "//src/main/java/com/google/devtools/build/lib/rules/cpp",
-        "//src/main/java/com/google/devtools/build/lib/rules/genquery",
-        "//src/main/java/com/google/devtools/build/lib/rules/objc",
-        "//src/main/java/com/google/devtools/build/skyframe",
-        "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//third_party:guava",
-        "//third_party:joda_time",
-        "//third_party:jsr305",
-    ],
-)
-
-java_library(
-    name = "bazel-base-rules",
-    srcs = [
-        "BazelBaseRuleClasses.java",
-    ],
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib:base-util",
-        "//src/main/java/com/google/devtools/build/lib:build-base",
-        "//src/main/java/com/google/devtools/build/lib:collect",
-        "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib:packages-internal",
-        "//src/main/java/com/google/devtools/build/lib:syntax",
-        "//src/main/java/com/google/devtools/build/lib:util",
-        "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/rules/apple",
-        "//src/main/java/com/google/devtools/build/lib/rules/cpp",
-        "//third_party:jsr305",
-    ],
-)
-
-java_library(
-    name = "workspace",
-    srcs = glob(
-        [
-            "workspace/*.java",
-        ],
-    ),
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib:base-util",
-        "//src/main/java/com/google/devtools/build/lib:build-base",
-        "//src/main/java/com/google/devtools/build/lib:collect",
-        "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib:packages-internal",
-        "//src/main/java/com/google/devtools/build/lib:syntax",
-        "//src/main/java/com/google/devtools/build/lib:util",
-        "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/rules/apple",
-        "//src/main/java/com/google/devtools/build/lib/rules/cpp",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//third_party:jsr305",
-    ],
-)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BUILD
deleted file mode 100644
index 28778cd24e..0000000000
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-package(
-    default_visibility = ["//src:__subpackages__"],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-java_library(
-    name = "cpp-rules",
-    srcs = glob(
-        [
-            "*.java",
-        ],
-    ),
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib:base-util",
-        "//src/main/java/com/google/devtools/build/lib:build-base",
-        "//src/main/java/com/google/devtools/build/lib:collect",
-        "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib:packages-internal",
-        "//src/main/java/com/google/devtools/build/lib:syntax",
-        "//src/main/java/com/google/devtools/build/lib:util",
-        "//src/main/java/com/google/devtools/build/lib:vfs",
-        "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-base-rules",
-        "//src/main/java/com/google/devtools/build/lib/rules/apple",
-        "//src/main/java/com/google/devtools/build/lib/rules/cpp",
-        "//src/main/protobuf:crosstool_config_proto",
-        "//third_party:jsr305",
-    ],
-)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
index 1db8eb3e98..c746977eff 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD
@@ -21,7 +21,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp:cpp-rules",
         "//src/main/java/com/google/devtools/build/lib/rules/apple",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/common/options",