aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/packages
diff options
context:
space:
mode:
authorGravatar dannark <dannark@google.com>2018-06-27 13:35:04 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-27 13:36:25 -0700
commit90e2b4b5e745fe2de9ca82bc8163c198e5be8ca9 (patch)
treef827defac036acf55c4253c01f11126e0c502572 /src/main/java/com/google/devtools/build/lib/packages
parent116971c08caa3f9bd94fc91066cd4cd1e432cafe (diff)
Automated refactor of Label.parseAbsolute() to always pass a repository mapping
RELNOTES: None PiperOrigin-RevId: 202360925
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages')
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java7
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/License.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java3
4 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java b/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java
index 34920f5da8..9f563183be 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java
@@ -14,6 +14,7 @@
package com.google.devtools.build.lib.packages;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -42,9 +43,9 @@ public class ConstantRuleVisibility implements RuleVisibility, Serializable {
static {
try {
- PUBLIC_LABEL = Label.parseAbsolute("//visibility:public");
- LEGACY_PUBLIC_LABEL = Label.parseAbsolute("//visibility:legacy_public");
- PRIVATE_LABEL = Label.parseAbsolute("//visibility:private");
+ PUBLIC_LABEL = Label.parseAbsolute("//visibility:public", ImmutableMap.of());
+ LEGACY_PUBLIC_LABEL = Label.parseAbsolute("//visibility:legacy_public", ImmutableMap.of());
+ PRIVATE_LABEL = Label.parseAbsolute("//visibility:private", ImmutableMap.of());
} catch (LabelSyntaxException e) {
throw new IllegalStateException();
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/License.java b/src/main/java/com/google/devtools/build/lib/packages/License.java
index 4a8c758a65..579c29e27d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/License.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/License.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.packages;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableTable;
import com.google.common.collect.Sets;
@@ -210,7 +211,8 @@ public final class License {
for (String str : licStrings) {
if (str.startsWith("exception=")) {
try {
- Label label = Label.parseAbsolute(str.substring("exception=".length()));
+ Label label =
+ Label.parseAbsolute(str.substring("exception=".length()), ImmutableMap.of());
exceptions.add(label);
} catch (LabelSyntaxException e) {
throw new LicenseParsingException(e.getMessage());
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index 5c5c222296..cac3570cc9 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -369,7 +369,7 @@ public class WorkspaceFactory {
throws EvalException, InterruptedException {
Label nameLabel;
try {
- nameLabel = Label.parseAbsolute("//external:" + name);
+ nameLabel = Label.parseAbsolute("//external:" + name, ImmutableMap.of());
try {
Package.Builder builder = PackageFactory.getContext(env, ast.getLocation()).pkgBuilder;
RuleClass ruleClass = ruleFactory.getRuleClass("bind");
@@ -377,7 +377,7 @@ public class WorkspaceFactory {
builder,
ruleClass,
nameLabel,
- actual == null ? null : Label.parseAbsolute(actual),
+ actual == null ? null : Label.parseAbsolute(actual, ImmutableMap.of()),
ast.getLocation(),
ruleFactory.getAttributeContainer(ruleClass));
} catch (RuleFactory.InvalidRuleException
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
index ff95dc8c2c..2a264e485e 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.packages;
import com.google.common.base.Preconditions;
import com.google.common.base.Verify;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
@@ -54,7 +55,7 @@ public class WorkspaceFactoryHelper {
overwriteRule(pkg, rule);
for (Map.Entry<String, Label> entry :
ruleClass.getExternalBindingsFunction().apply(rule).entrySet()) {
- Label nameLabel = Label.parseAbsolute("//external:" + entry.getKey());
+ Label nameLabel = Label.parseAbsolute("//external:" + entry.getKey(), ImmutableMap.of());
addBindRule(
pkg,
bindRuleClass,