Replace Constants.PRODUCT_NAME with a startup option --product_name=bazel and

(finally) delete Constants.java.

For bazel the file Constants.java is the only source of 
src/main/java/com/google/devtools/build/lib:common and since it was exporting
guava then many dependencies needed to be fixed.

--
MOS_MIGRATED_REVID=123648270

18 files changed, 62 insertions, 93 deletions

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index bc6ba9c0d8..a7dce22ce7 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -549,6 +549,8 @@ static vector<string> GetArgumentArray() {
                      globals->options.invocation_policy);
   }
 
+  result.push_back("--product_name=" + globals->options.GetProductName());
+
   globals->options.AddExtraOptions(&result);
 
   // The option sources are transmitted in the following format:
diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD
index f7248fe682..3a48dc4f13 100644
--- a/src/main/java/com/google/devtools/build/docgen/BUILD
+++ b/src/main/java/com/google/devtools/build/docgen/BUILD
@@ -11,7 +11,6 @@ java_library(
     deps = [
         "//src/main/java/com/google/devtools/build/lib:android-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:java-rules",
         "//src/main/java/com/google/devtools/build/lib:packages",
         "//src/main/java/com/google/devtools/build/lib:skylarkinterface",
@@ -31,7 +30,6 @@ java_binary(
         ":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",
     ],
 )
 
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index bef34ce1f1..19d181f6bf 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -5,21 +5,10 @@ package(
 )
 
 java_library(
-    name = "common",
-    srcs = [
-        "Constants.java",
-    ],
-    exports = ["//third_party:guava"],
-    deps = [
-        "//third_party:guava",
-    ],
-)
-
-java_library(
     name = "shell",
     srcs = glob(["shell/*.java"]),
     deps = [
-        ":common",
+        "//third_party:guava",
     ],
 )
 
@@ -57,7 +46,7 @@ java_library(
     name = "graph",
     srcs = glob(["graph/*.java"]),
     deps = [
-        ":common",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -74,8 +63,8 @@ java_library(
         "//conditions:default": ["//src/main/native:libunix.so"],
     }),
     deps = [
-        ":common",
         ":shell",
+        "//third_party:guava",
     ],
 )
 
@@ -84,8 +73,8 @@ java_library(
     name = "concurrent",
     srcs = glob(["concurrent/*.java"]),
     deps = [
-        ":common",
         ":preconditions",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -98,8 +87,8 @@ java_library(
         "collect/nestedset/*.java",
     ]),
     deps = [
-        ":common",
         ":preconditions",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -130,11 +119,11 @@ java_library(
     deps = [
         ":base-util",
         ":clock",
-        ":common",
         ":concurrent",
         ":os_util",
         ":preconditions",
         ":unix",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -148,10 +137,10 @@ java_library(
         "profiler/statistics/*.java",
     ]),
     deps = [
-        ":common",
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -162,11 +151,11 @@ java_library(
     srcs = glob(["vfs/inmemoryfs/*.java"]),
     deps = [
         ":clock",
-        ":common",
         ":concurrent",
         ":preconditions",
         ":unix",
         ":vfs",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -193,8 +182,8 @@ java_library(
         "util/VarInt.java",
     ],
     deps = [
-        ":common",
         ":preconditions",
+        "//third_party:guava",
     ],
 )
 
@@ -203,7 +192,7 @@ java_library(
     name = "preconditions",
     srcs = ["util/Preconditions.java"],
     deps = [
-        ":common",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -214,9 +203,9 @@ java_library(
     srcs = glob(["util/io/*.java"]),
     deps = [
         ":clock",
-        ":common",
         ":concurrent",
         ":vfs",
+        "//third_party:guava",
     ],
 )
 
@@ -253,7 +242,6 @@ java_library(
     deps = [
         ":base-util",
         ":collect",
-        ":common",
         ":concurrent",
         ":exitcode-external",
         ":os_util",
@@ -262,6 +250,7 @@ java_library(
         ":unix",
         ":vfs",
         "//src/main/java/com/google/devtools/common/options",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -281,11 +270,11 @@ java_library(
     name = "events",
     srcs = glob(["events/*.java"]),
     deps = [
-        ":common",
         ":concurrent",
         ":io",
         ":preconditions",
         ":vfs",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -336,11 +325,11 @@ java_library(
     srcs = glob(["cmdline/*.java"]),
     deps = [
         ":base-util",
-        ":common",
         ":concurrent",
         ":skylarkinterface",
         ":util",
         ":vfs",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -353,7 +342,6 @@ java_library(
     deps = [
         ":cmdline",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":skylarkinterface",
@@ -364,6 +352,7 @@ java_library(
         "//third_party:asm-util",
         "//third_party:auto_value",
         "//third_party:bytebuddy",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -400,7 +389,6 @@ java_library(
     deps = [
         ":cmdline",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":skylarkinterface",
@@ -486,7 +474,6 @@ java_library(
         ":base-util",
         ":cmdline",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":exitcode-external",
@@ -536,7 +523,6 @@ java_library(
         ":build-base",
         ":build-info",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":ideinfo",
@@ -601,7 +587,6 @@ java_library(
     srcs = glob(["bazel/commands/*.java"]),
     resources = ["bazel/commands/fetch.txt"],
     deps = [
-        ":common",
         ":events",
         ":exitcode-external",
         ":java-rules",
@@ -681,13 +666,13 @@ java_library(
     deps = [
         ":build-base",
         ":collect",
-        ":common",
         ":concurrent",
         ":packages-internal",
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
+        "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf",
     ],
@@ -701,7 +686,6 @@ java_library(
     deps = [
         ":build-base",
         ":collect",
-        ":common",
         ":concurrent",
         ":packages-internal",
         ":skylarkinterface",
@@ -728,7 +712,6 @@ java_library(
     deps = [
         ":build-base",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":java-implicit-attributes",
@@ -741,6 +724,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_java_proto",
+        "//third_party:guava",
         "//third_party:joda_time",
         "//third_party:jsr305",
         "//third_party/protobuf",
@@ -760,7 +744,6 @@ java_library(
     deps = [
         ":build-base",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":java-rules",
@@ -775,6 +758,7 @@ java_library(
         "//src/main/protobuf:android_deploy_info_java_proto",
         "//src/main/protobuf:apk_manifest_java_proto",
         "//third_party:android_sdklib",
+        "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf",
     ],
@@ -788,7 +772,6 @@ java_library(
     deps = [
         ":build-base",
         ":collect",
-        ":common",
         ":concurrent",
         ":packages-internal",
         ":skylarkinterface",
@@ -799,6 +782,7 @@ java_library(
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:crosstool_config_java_proto",
         "//src/main/protobuf:extra_actions_base_java_proto",
+        "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf",
     ],
@@ -813,7 +797,6 @@ java_library(
         ":android-rules",
         ":build-base",
         ":collect",
-        ":common",
         ":concurrent",
         ":java-rules",
         ":packages-internal",
@@ -855,7 +838,6 @@ java_library(
         ":clock",
         ":cmdline",
         ":collect",
-        ":common",
         ":concurrent",
         ":events",
         ":exitcode-external",
@@ -879,6 +861,7 @@ java_library(
         "//src/main/protobuf:command_server_java_proto",
         "//src/main/protobuf:invocation_policy_java_proto",
         "//src/main/protobuf:test_status_java_proto",
+        "//third_party:guava",
         "//third_party:joda_time",
         "//third_party:jsr305",
         "//third_party/grpc:grpc-jar",
@@ -896,7 +879,6 @@ java_library(
     name = "all-build-rules",
     exports = [
         ":build-base",
-        ":common",
         ":concurrent",
         ":graph",
         ":packages-internal",
@@ -905,6 +887,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/rules/objc",
         "//src/main/java/com/google/devtools/common/options",
+        "//third_party:guava",
     ],
 )
 
@@ -928,7 +911,6 @@ java_library(
 java_library(
     name = "query2",
     exports = [
-        ":common",
         ":concurrent",
         ":events",
         ":foundation",
@@ -939,6 +921,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/query2",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_java_proto",
+        "//third_party:guava",
     ],
 )
 
diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java
deleted file mode 100644
index 90eef21acc..0000000000
--- a/src/main/java/com/google/devtools/build/lib/Constants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib;
-
-/**
- * A temporary class of constants; these encode differences between Google's internal setup and
- * Bazel. We're working to remove this class, which requires cleaning up our internal code base.
- * Please don't add anything here unless you know what you're doing.
- */
-public final class Constants {
-  private Constants() {}
-
-  // Google's internal name for Bazel is 'Blaze', and it will take some more time to change that.
-  public static final String PRODUCT_NAME = "bazel";
-}
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 8f717e78da..a6f705ae36 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -11,7 +11,6 @@ java_library(
     ]),
     deps = [
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:io",
@@ -24,6 +23,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_java_proto",
+        "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf",
     ],
diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
index 2fac43b87b..3ba6cf4f9c 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -8,7 +8,6 @@ java_library(
     deps = [
         ":query-engine",
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:graph",
@@ -16,6 +15,7 @@ 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/skyframe",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -27,13 +27,13 @@ java_library(
         ":query-engine",
         ":query2",
         "//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:graph",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_java_proto",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
@@ -43,10 +43,10 @@ java_library(
     name = "query-engine",
     srcs = glob(["engine/*.java"]),
     deps = [
-        "//src/main/java/com/google/devtools/build/lib:common",
         "//src/main/java/com/google/devtools/build/lib:concurrent",
         "//src/main/java/com/google/devtools/build/lib:graph",
         "//src/main/java/com/google/devtools/build/lib:util",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD b/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
index 4538e8a1fc..e0cd5c3d1e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/BUILD
@@ -11,7 +11,6 @@ java_library(
     deps = [
         "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:cmdline",
-        "//src/main/java/com/google/devtools/build/lib:common",
         "//src/main/java/com/google/devtools/build/lib:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD
index 972a8e7545..cbfb7f3906 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/BUILD
@@ -10,11 +10,11 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         "//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:packages-internal",
         "//src/main/java/com/google/devtools/build/lib/rules/apple",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
         "//src/main/protobuf:xcodegen_java_proto",
+        "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
index 64a0a9ca00..96f52ba877 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -11,7 +11,6 @@ java_library(
     deps = [
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:io",
@@ -26,6 +25,7 @@ java_library(
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:crosstool_config_java_proto",
         "//src/main/protobuf:extra_actions_base_java_proto",
+        "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf",
     ],
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 46edcfae09..ab64d93593 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
@@ -11,7 +11,6 @@ java_library(
     deps = [
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
@@ -23,6 +22,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/query2:query-output",
         "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
+        "//third_party:guava",
         "//third_party:jsr305",
         "//third_party/protobuf",
     ],
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 24d6dfb76b..5c8d27f327 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
@@ -12,7 +12,6 @@ java_library(
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:java-rules",
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index ce6b1f5c0d..8cb02632c2 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -27,7 +27,6 @@ import com.google.common.eventbus.SubscriberExceptionContext;
 import com.google.common.eventbus.SubscriberExceptionHandler;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Uninterruptibles;
-import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.BlazeVersionInfo;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
@@ -165,6 +164,7 @@ public final class BlazeRuntime {
   private final String defaultsPackageContent;
   private final QueryEnvironmentFactory queryEnvironmentFactory;
   private final SubscriberExceptionHandler eventBusExceptionHandler;
+  private final String productName;
 
   // Workspace state (currently exactly one workspace per server)
   private BlazeWorkspace workspace;
@@ -176,7 +176,8 @@ public final class BlazeRuntime {
       OptionsProvider startupOptionsProvider, Iterable<BlazeModule> blazeModules,
       SubscriberExceptionHandler eventBusExceptionHandler,
       ProjectFile.Provider projectFileProvider,
-      InvocationPolicy invocationPolicy, Iterable<BlazeCommand> commands) {
+      InvocationPolicy invocationPolicy, Iterable<BlazeCommand> commands,
+      String productName) {
     // Server state
     this.blazeModules = blazeModules;
     overrideCommands(commands);
@@ -196,6 +197,7 @@ public final class BlazeRuntime {
         ruleClassProvider.getDefaultsPackageContent(getInvocationPolicy());
     CommandNameCache.CommandNameCacheInstance.INSTANCE.setCommandNameCache(
         new CommandNameCacheImpl(getCommandMap()));
+    this.productName = productName;
   }
 
   private static InvocationPolicy createInvocationPolicyFromModules(
@@ -994,6 +996,8 @@ public final class BlazeRuntime {
     }
 
     BlazeServerStartupOptions startupOptions = options.getOptions(BlazeServerStartupOptions.class);
+    String productName = startupOptions.productName.toLowerCase();
+
     if (startupOptions.oomMoreEagerlyThreshold != 100) {
       new RetainedHeapLimiter(startupOptions.oomMoreEagerlyThreshold).install();
     }
@@ -1018,7 +1022,7 @@ public final class BlazeRuntime {
     }
 
     PathFragment outputPathFragment = BlazeDirectories.outputPathFromOutputBase(
-        outputBase, workspaceDirectory, startupOptions.deepExecRoot, Constants.PRODUCT_NAME);
+        outputBase, workspaceDirectory, startupOptions.deepExecRoot, productName);
     FileSystem fs = null;
     for (BlazeModule module : blazeModules) {
       FileSystem moduleFs = module.getFileSystem(options, outputPathFragment);
@@ -1051,7 +1055,7 @@ public final class BlazeRuntime {
     BlazeDirectories directories =
         new BlazeDirectories(installBasePath, outputBasePath, workspaceDirectoryPath,
                              startupOptions.deepExecRoot, startupOptions.installMD5,
-                             Constants.PRODUCT_NAME);
+                             productName);
 
     Clock clock = BlazeClock.instance();
 
@@ -1064,7 +1068,9 @@ public final class BlazeRuntime {
           ExitCode.LOCAL_ENVIRONMENTAL_ERROR);
     }
 
-    BlazeRuntime.Builder runtimeBuilder = new BlazeRuntime.Builder().setDirectories(directories)
+    BlazeRuntime.Builder runtimeBuilder = new BlazeRuntime.Builder()
+        .setProductName(productName)
+        .setDirectories(directories)
         .setStartupOptionsProvider(options)
         .setBinTools(binTools)
         .setClock(clock)
@@ -1166,7 +1172,7 @@ public final class BlazeRuntime {
   }
 
   public String getProductName() {
-    return Constants.PRODUCT_NAME;
+    return productName;
   }
 
   /**
@@ -1189,11 +1195,12 @@ public final class BlazeRuntime {
     private UUID instanceId;
     private final List<BlazeCommand> commands = new ArrayList<>();
     private InvocationPolicy invocationPolicy = InvocationPolicy.getDefaultInstance();
+    private String productName;
 
     public BlazeRuntime build() throws AbruptExitException {
+      Preconditions.checkNotNull(productName);
       Preconditions.checkNotNull(directories);
       Preconditions.checkNotNull(startupOptionsProvider);
-
       Clock clock = (this.clock == null) ? BlazeClock.instance() : this.clock;
       UUID instanceId =  (this.instanceId == null) ? UUID.randomUUID() : this.instanceId;
 
@@ -1304,11 +1311,16 @@ public final class BlazeRuntime {
       BlazeRuntime runtime = new BlazeRuntime(queryEnvironmentFactory, packageFactory,
           ruleClassProvider, configurationFactory, clock, startupOptionsProvider,
           ImmutableList.copyOf(blazeModules), eventBusExceptionHandler, projectFileProvider,
-          invocationPolicy, commands);
+          invocationPolicy, commands, productName);
       runtime.initWorkspace(directories, binTools);
       return runtime;
     }
 
+    public Builder setProductName(String productName) {
+      this.productName = productName;
+      return this;
+    }
+
     public Builder setBinTools(BinTools binTools) {
       this.binTools = binTools;
       return this;
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index 6a21aea930..66f2e2d6f9 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -248,7 +248,6 @@ public class BlazeServerStartupOptions extends OptionsBase {
           + "changes instead of scanning every file for a change.")
   public boolean watchFS;
 
-
   @Option(name = "invocation_policy",
       defaultValue = "",
       category = "undocumented",
@@ -263,4 +262,12 @@ public class BlazeServerStartupOptions extends OptionsBase {
       help = "Port to start up the gRPC command server on. If 0, let the kernel choose. If -1, "
           + "use a custom protocol on an AF_UNIX socket.")
   public int commandPort;
+
+  @Option(name = "product_name",
+      defaultValue = "bazel", // NOTE: purely decorative!
+      category = "undocumented",
+      help = "The name of the build system. It is used as part of the name of the generated "
+          + "directories (e.g. productName-bin for binaries) as well as for printing error "
+          + "messages and logging")
+  public String productName;
 }
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 e236e24e51..1fe3fba497 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
@@ -10,7 +10,6 @@ java_library(
     ],
     deps = [
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:io",
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 06209318e6..959338925c 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -322,7 +322,6 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:bazel-main",
         "//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:java-rules",
         "//src/main/java/com/google/devtools/build/lib:packages",
         "//src/main/java/com/google/devtools/build/lib:python-rules",
@@ -565,7 +564,6 @@ java_test(
         "//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: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:packages",
@@ -810,7 +808,6 @@ java_test(
         "//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:cmdline",
-        "//src/main/java/com/google/devtools/build/lib:common",
         "//src/main/java/com/google/devtools/build/lib:flags",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:util",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
index 758194dabd..6e16c4f46e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
@@ -8,7 +8,6 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:bazel-repository",
         "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:cmdline",
-        "//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:runtime",
         "//src/main/java/com/google/devtools/build/lib:util",
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
index 459a9ccf96..8bd8bff189 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java
@@ -129,12 +129,14 @@ public class BlazeCommandDispatcherRcoptionsTest {
 
   @Before
   public final void initializeRuntime() throws Exception {
+    String productName = TestConstants.PRODUCT_NAME;
     BlazeDirectories directories =
         new BlazeDirectories(
             scratch.dir("install_base"), scratch.dir("output_base"), scratch.dir("pkg"),
-            TestConstants.PRODUCT_NAME);
+            productName);
     this.runtime =
         new BlazeRuntime.Builder()
+            .setProductName(productName)
             .setDirectories(directories)
             .setStartupOptionsProvider(
                 OptionsParser.newOptionsParser(BlazeServerStartupOptions.class))
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index e191b59a9c..bd2f417b75 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -48,7 +48,6 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:clock",
         "//src/main/java/com/google/devtools/build/lib:cmdline",
         "//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:concurrent",
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/main/java/com/google/devtools/build/lib:io",