Separate BUILD file for options and docgen.

--
MOS_MIGRATED_REVID=105511114

15 files changed, 134 insertions, 120 deletions

diff --git a/src/main/java/BUILD b/src/main/java/BUILD
index 89e0276fec..539903496e 100644
--- a/src/main/java/BUILD
+++ b/src/main/java/BUILD
@@ -76,18 +76,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "options",
-    srcs = glob([
-        "com/google/devtools/common/options/*.java",
-    ]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//third_party:guava",
-        "//third_party:jsr305",
-    ],
-)
-
 filegroup(
     name = "options-srcs",
     srcs = glob([
@@ -105,9 +93,9 @@ java_library(
         ":common",
         ":concurrent",
         ":events",
-        ":options",
         ":util",
         ":vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//third_party:auto_value",
         "//third_party:guava",
@@ -131,10 +119,10 @@ java_library(
         ":common",
         ":concurrent",
         ":events",
-        ":options",
         ":syntax",
         ":util",
         ":vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -167,10 +155,10 @@ java_library(
         ":clock",
         ":common",
         ":concurrent",
-        ":options",
         ":os_util",
         ":shell",
         ":unix",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:jsr305",
     ],
@@ -259,11 +247,11 @@ java_library(
         ":collect",
         ":common",
         ":concurrent",
-        ":options",
         ":os_util",
         ":shell",
         ":unix",
         ":vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:jsr305",
     ],
@@ -310,7 +298,6 @@ java_library(
         ":events",
         ":graph",
         ":io",
-        ":options",
         ":os_util",
         ":packages",
         ":shell",
@@ -318,6 +305,7 @@ java_library(
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:android_studio_ide_info_proto",
         "//src/main/protobuf:bundlemerge_proto",
         "//src/main/protobuf:crosstool_config_proto",
@@ -356,11 +344,11 @@ java_library(
         ":concurrent",
         ":events",
         ":graph",
-        ":options",
         ":packages",
         ":skyframe-base",
         ":util",
         ":vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -379,10 +367,8 @@ java_library(
         ":collect",
         ":common",
         ":concurrent",
-        ":docgen",
         ":events",
         ":io",
-        ":options",
         ":os_util",
         ":packages",
         ":profiler-output",
@@ -392,7 +378,9 @@ java_library(
         ":skyframe-base",
         ":util",
         ":vfs",
+        "//src/main/java/com/google/devtools/build/docgen",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//src/main/protobuf:invocation_policy_proto",
         "//src/main/protobuf:test_status_proto",
@@ -404,22 +392,6 @@ java_library(
 )
 
 java_library(
-    name = "docgen",
-    srcs = glob([
-        "com/google/devtools/build/docgen/**/*.java",
-    ]),
-    deps = [
-        ":analysis-exec-rules-skyframe",
-        ":common",
-        ":concurrent",
-        ":packages",
-        ":util",
-        "//third_party:apache_velocity",
-        "//third_party:guava",
-    ],
-)
-
-java_library(
     name = "runtime",
     srcs = glob([
         "com/google/devtools/build/lib/runtime/**/*.java",
@@ -433,10 +405,8 @@ java_library(
         ":collect",
         ":common",
         ":concurrent",
-        ":docgen",
         ":events",
         ":io",
-        ":options",
         ":os_util",
         ":packages",
         ":profiler-output",
@@ -446,7 +416,9 @@ java_library(
         ":unix",
         ":util",
         ":vfs",
+        "//src/main/java/com/google/devtools/build/docgen",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//src/main/protobuf:invocation_policy_proto",
         "//src/main/protobuf:test_status_proto",
@@ -495,7 +467,7 @@ java_library(
         "//third_party:jquery",
     ],
     visibility = [
-        "//src/test/java:__subpackages__",
+        "//src:__subpackages__",
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:__pkg__",
     ],
     runtime_deps = [
@@ -520,7 +492,6 @@ java_library(
         ":graph",
         ":io",
         ":maven-connector",
-        ":options",
         ":os_util",
         ":packages",
         ":query2",
@@ -537,6 +508,7 @@ java_library(
         "//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",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//src/main/protobuf:crosstool_config_proto",
         "//src/main/protobuf:extra_actions_base_proto",
@@ -603,82 +575,32 @@ java_binary(
 filegroup(
     name = "srcs",
     srcs = glob(["**"]) + [
+        "//src/main/java/com/google/devtools/common/options:srcs",
         "//src/main/java/com/google/devtools/build/lib/bazel/dash:srcs",
         "//src/main/java/com/google/devtools/build/lib/sandbox:srcs",
         "//src/main/java/com/google/devtools/build/lib/standalone:srcs",
         "//src/main/java/com/google/devtools/build/lib/worker:srcs",
+        "//src/main/java/com/google/devtools/build/docgen:srcs",
     ],
     visibility = ["//src/test/shell/bazel:__pkg__"],
 )
 
 filegroup(
-    name = "be-template_files",
-    srcs = glob([
-        "com/google/devtools/build/docgen/templates/**/*.html",
-        "com/google/devtools/build/docgen/templates/**/*.vm",
-    ]),
-)
-
-java_library(
-    name = "docgen_javalib",
-    srcs = glob(
-        ["com/google/devtools/build/docgen/**/*.java"],
-        exclude = [
-            "com/google/devtools/build/docgen/BuildEncyclopediaGenerator.java",
-            "com/google/devtools/build/docgen/SkylarkDocumentationGenerator.java",
-        ],
-    ),
-    resources = [":be-template_files"],
-    exports = [
-        ":bazel-core",
-    ],
-    deps = [
-        ":analysis-exec-rules-skyframe",
-        ":bazel-core",
-        ":common",
-        ":concurrent",
-        ":packages",
-        ":util",
-        "//third_party:apache_velocity",
-        "//third_party:guava",
-        "//third_party:jsr305",
-    ],
-)
-
-filegroup(
     name = "docs_embedded_in_sources",
     srcs = glob(["com/google/devtools/build/lib/**/*.java"]),
 )
 
-java_binary(
-    name = "docgen_bin",
-    srcs = ["com/google/devtools/build/docgen/BuildEncyclopediaGenerator.java"],
-    main_class = "com.google.devtools.build.docgen.BuildEncyclopediaGenerator",
-    deps = [
-        ":analysis-exec-rules-skyframe",
-        ":common",
-        ":docgen_javalib",
-    ],
-)
-
-java_binary(
-    name = "skydoc_bin",
-    srcs = ["com/google/devtools/build/docgen/SkylarkDocumentationGenerator.java"],
-    main_class = "com.google.devtools.build.docgen.SkylarkDocumentationGenerator",
-    deps = [":docgen_javalib"],
-)
-
 genrule(
     name = "gen_buildencyclopedia",
     srcs = [":docs_embedded_in_sources"],
     outs = ["build-encyclopedia.html"],
-    cmd = ("$(location docgen_bin)" +
+    cmd = ("$(location //src/main/java/com/google/devtools/build/docgen:docgen_bin)" +
            " $$PWD/src/main/java/com/google/devtools/build/lib" +
            " $$PWD" +
            " && cp $$PWD/build-encyclopedia.html $@"),
     tools = [
-        ":docgen_bin",
-        ":docgen_javalib",
+        "//src/main/java/com/google/devtools/build/docgen:docgen_bin",
+        "//src/main/java/com/google/devtools/build/docgen:docgen_javalib",
     ],
 )
 
@@ -686,9 +608,9 @@ genrule(
     name = "gen_skylarklibrary",
     outs = ["skylark-library.zip"],
     cmd = "mkdir -p $(@D)/skylark-lib &&" +
-          "$(location :skydoc_bin) $(@D)/skylark-lib &&" +
+          "$(location //src/main/java/com/google/devtools/build/docgen:skydoc_bin) $(@D)/skylark-lib &&" +
           "zip -qj $@ $(@D)/skylark-lib/*",
-    tools = [":skydoc_bin"],
+    tools = ["//src/main/java/com/google/devtools/build/docgen:skydoc_bin"],
 )
 
 #
diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD
new file mode 100644
index 0000000000..372b976a77
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/docgen/BUILD
@@ -0,0 +1,74 @@
+package(default_visibility = ["//src:__subpackages__"])
+
+java_library(
+    name = "docgen",
+    srcs = glob([
+        "**/*.java",
+    ]),
+    deps = [
+        "//src/main/java:analysis-exec-rules-skyframe",
+        "//src/main/java:common",
+        "//src/main/java:concurrent",
+        "//src/main/java:packages",
+        "//src/main/java:util",
+        "//third_party:apache_velocity",
+        "//third_party:guava",
+    ],
+)
+
+java_library(
+    name = "docgen_javalib",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = [
+            "BuildEncyclopediaGenerator.java",
+            "SkylarkDocumentationGenerator.java",
+        ],
+    ),
+    resources = [":be-template_files"],
+    exports = [
+        "//src/main/java:bazel-core",
+    ],
+    deps = [
+        "//src/main/java:analysis-exec-rules-skyframe",
+        "//src/main/java:bazel-core",
+        "//src/main/java:common",
+        "//src/main/java:concurrent",
+        "//src/main/java:packages",
+        "//src/main/java:util",
+        "//third_party:apache_velocity",
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ],
+)
+
+java_binary(
+    name = "docgen_bin",
+    srcs = ["BuildEncyclopediaGenerator.java"],
+    main_class = "com.google.devtools.build.docgen.BuildEncyclopediaGenerator",
+    deps = [
+        ":docgen_javalib",
+        "//src/main/java:analysis-exec-rules-skyframe",
+        "//src/main/java:common",
+    ],
+)
+
+filegroup(
+    name = "be-template_files",
+    srcs = glob([
+        "templates/**/*.html",
+        "templates/**/*.vm",
+    ]),
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
+
+java_binary(
+    name = "skydoc_bin",
+    srcs = ["SkylarkDocumentationGenerator.java"],
+    main_class = "com.google.devtools.build.docgen.SkylarkDocumentationGenerator",
+    deps = [":docgen_javalib"],
+)
diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD
index 2d244a7695..42ee5797ef 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -13,12 +13,12 @@ java_library(
         "//src/main/java:concurrent",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:shell",
         "//src/main/java:skyframe-base",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
         "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
index e66329c997..bba5eb7e12 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
@@ -13,10 +13,10 @@ java_library(
     deps = [
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:events",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:runtime",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:dash_proto",
         "//third_party:apache_httpclient",
         "//third_party:apache_httpcore",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
index baeabc821c..4b55976c2e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
@@ -12,7 +12,6 @@ java_library(
         "//src/main/java:concurrent",
         "//src/main/java:events",
         "//src/main/java:graph",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:query2",
         "//src/main/java:shell",
@@ -20,6 +19,7 @@ java_library(
         "//src/main/java:util",
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:crosstool_config_proto",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
index 709b4fb7c0..f734ef3c67 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -13,7 +13,6 @@ java_library(
         "//src/main/java:common",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:os_util",
         "//src/main/java:packages",
         "//src/main/java:shell",
@@ -22,6 +21,7 @@ java_library(
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
     ],
 )
diff --git a/src/main/java/com/google/devtools/build/lib/worker/BUILD b/src/main/java/com/google/devtools/build/lib/worker/BUILD
index ff14ae2c3d..a9b0b896b7 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/worker/BUILD
@@ -14,12 +14,12 @@ java_library(
         "//src/main/java:concurrent",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:worker_protocol_proto",
         "//third_party:apache_commons_pool2",
         "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/common/options/BUILD b/src/main/java/com/google/devtools/common/options/BUILD
new file mode 100644
index 0000000000..93b88412b6
--- /dev/null
+++ b/src/main/java/com/google/devtools/common/options/BUILD
@@ -0,0 +1,18 @@
+package(default_visibility = ["//src:__subpackages__"])
+
+java_library(
+    name = "options",
+    srcs = glob([
+        "*.java",
+    ]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
diff --git a/src/objc_tools/plmerge/BUILD b/src/objc_tools/plmerge/BUILD
index c3a8eddaa9..2dd46af95a 100644
--- a/src/objc_tools/plmerge/BUILD
+++ b/src/objc_tools/plmerge/BUILD
@@ -7,7 +7,7 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":plmerge_lib",
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party/java/dd_plist",
     ],
diff --git a/src/objc_tools/xcodegen/BUILD b/src/objc_tools/xcodegen/BUILD
index b2100f4fcb..470793671f 100644
--- a/src/objc_tools/xcodegen/BUILD
+++ b/src/objc_tools/xcodegen/BUILD
@@ -7,7 +7,7 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":xcodegen_lib",
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:xcodegen_proto",
         "//third_party:guava",
         "//third_party:protobuf",
diff --git a/src/test/java/BUILD b/src/test/java/BUILD
index d7ab63f93d..2ed7ec063e 100644
--- a/src/test/java/BUILD
+++ b/src/test/java/BUILD
@@ -63,7 +63,7 @@ java_test(
     srcs = glob(["com/google/devtools/common/options/*.java"]),
     args = ["com.google.devtools.common.options.AllTests"],
     deps = [
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/test/java:testutil",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -153,13 +153,13 @@ java_test(
         "//src/main/java:concurrent",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:os_util",
         "//src/main/java:packages",
         "//src/main/java:shell",
         "//src/main/java:unix",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:junit4",
@@ -184,9 +184,9 @@ java_test(
         ":testutil",
         "//src/main/java:bazel-core",
         "//src/main/java:clock",
-        "//src/main/java:options",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:junit4",
@@ -209,12 +209,12 @@ java_library(
         "//src/main/java:concurrent",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:skyframe-base",
         "//src/main/java:util",
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -241,11 +241,11 @@ java_test(
         "//src/main/java:collect",
         "//src/main/java:concurrent",
         "//src/main/java:events",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -280,13 +280,13 @@ java_library(
         "//src/main/java:concurrent",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:runtime",
         "//src/main/java:skyframe-base",
         "//src/main/java:util",
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -341,10 +341,10 @@ java_test(
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:common",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -445,11 +445,11 @@ java_library(
         "//src/main/java:clock",
         "//src/main/java:events",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:skyframe-base",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -759,10 +759,10 @@ java_test(
         "//src/main/java:buildtool-runtime",
         "//src/main/java:clock",
         "//src/main/java:io",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:invocation_policy_proto",
         "//src/main/protobuf:test_status_proto",
         "//third_party:guava",
@@ -785,13 +785,13 @@ java_test(
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:clock",
         "//src/main/java:events",
-        "//src/main/java:options",
         "//src/main/java:os_util",
         "//src/main/java:shell",
         "//src/main/java:util",
         "//src/main/java:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/sandbox",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
@@ -805,7 +805,7 @@ java_library(
         "//src/test/shell/bazel:__pkg__",
     ],
     deps = [
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:worker_protocol_proto",
         "//third_party:guava",
     ],
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD b/src/tools/android/java/com/google/devtools/build/android/BUILD
index 4ff57d7dc4..f51cbddc96 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -27,7 +27,7 @@ java_library(
     name = "android_builder_lib",
     srcs = glob(["*.java"]),
     deps = [
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:android_common",
         "//third_party:apache_commons_compress",
         "//third_party:guava",
diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
index 47c82488d7..37e1ab311e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
@@ -21,7 +21,7 @@ java_library(
     ],
     deps = [
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:java_compilation_proto",
         "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
         "//third_party:guava",
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
index 3740a2a213..9c4683404a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
@@ -52,7 +52,7 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":splitter_lib",
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
     ],
 )
 
@@ -65,6 +65,6 @@ java_binary(
     visibility = ["//visibility:public"],
     deps = [
         ":ziputils_lib",
-        "//src/main/java:options",
+        "//src/main/java/com/google/devtools/common/options",
     ],
 )
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
index 0c3211662a..2ae210b9ee 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
@@ -7,9 +7,9 @@ java_library(
         "//src/main/java:bazel-core",
         "//src/main/java:buildtool-runtime",
         "//src/main/java:events",
-        "//src/main/java:options",
         "//src/main/java:packages",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/common/options",
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven",
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven:rule",
         "//third_party:guava",