diff options
| author |  ajmichael <ajmichael@google.com> | 2017-12-19 15:09:42 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-19 17:25:47 -0800 |
| commit | ed5dfd7c110dbc47274fd25bc6aca534b698741a (patch) | |
| tree | 2f59279b7fbce7f6affc1b92d06b51fbb1ea632a /src/main/java | |
| parent | 044c03be1d5d68f347dd1205e3e0a752c2e5ac66 (diff) | |
Move java and android skylark constants into the correct rulesets.
RELNOTES: None
PiperOrigin-RevId: 179609932
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index f503af88ee..ebac337780 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -406,6 +406,11 @@ public class BazelRuleClassProvider { builder.addRuleDefinition(new ExtraActionRule()); builder.addRuleDefinition(new ActionListenerRule()); + builder.addSkylarkAccessibleTopLevels("java_common", + new JavaSkylarkCommon(BazelJavaSemantics.INSTANCE)); + builder.addSkylarkAccessibleTopLevels("JavaInfo", JavaInfo.PROVIDER); + builder.addSkylarkAccessibleTopLevels("java_proto_common", JavaProtoSkylarkCommon.class); + try { builder.addWorkspaceFilePrefix( ResourceFileLoader.loadResource(BazelJavaRuleClasses.class, "jdk.WORKSPACE")); @@ -469,10 +474,6 @@ public class BazelRuleClassProvider { builder.addRuleDefinition(new AndroidLocalTestBaseRule()); builder.addSkylarkAccessibleTopLevels("android_common", new AndroidSkylarkCommon()); - builder.addSkylarkAccessibleTopLevels("java_common", - new JavaSkylarkCommon(BazelJavaSemantics.INSTANCE)); - builder.addSkylarkAccessibleTopLevels("JavaInfo", JavaInfo.PROVIDER); - builder.addSkylarkAccessibleTopLevels("java_proto_common", JavaProtoSkylarkCommon.class); try { builder.addWorkspaceFilePrefix( |