diff options
| author |  Luis Fernando Pino Duque <lpino@google.com> | 2016-05-31 16:21:46 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-05-31 18:07:47 +0000 |
| commit | 623cdf810d1ca367c981a5353c5c4bfda18cc58c (patch) | |
| tree | dc954ce3fe8fa2338957e99ebee49e3cfe5cbe5d /src/main/java/com/google/devtools/build/lib/rules | |
| parent | dc54452bafbb50029ba11678ade3ad85ad028817 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
5 files changed, 3 insertions, 5 deletions
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", |