diff options
| author |  Googler <noreply@google.com> | 2018-02-05 12:03:25 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-05 12:05:22 -0800 |
| commit | d5de133579f2eca9634a49c022ce9345d7faa130 (patch) | |
| tree | bad2054ab53ac16521c4681fb39ea69a610b0d30 /src/main/java/com/google/devtools | |
| parent | a3bdffe83b1f8401e019e4355be7f966a62d08d3 (diff) | |
PiperOrigin-RevId: 184564534
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 1 |
2 files changed, 4 insertions, 0 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 1671176a71..c718e04adb 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 @@ -67,6 +67,7 @@ import com.google.devtools.build.lib.rules.android.AndroidInstrumentationTestRul import com.google.devtools.build.lib.rules.android.AndroidLibraryBaseRule; import com.google.devtools.build.lib.rules.android.AndroidLocalTestBaseRule; import com.google.devtools.build.lib.rules.android.AndroidNeverlinkAspect; +import com.google.devtools.build.lib.rules.android.AndroidResourcesInfo; import com.google.devtools.build.lib.rules.android.AndroidRuleClasses; import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.AndroidToolsDefaultsJarRule; import com.google.devtools.build.lib.rules.android.AndroidSkylarkCommon; @@ -259,6 +260,8 @@ public class BazelRuleClassProvider { AndroidInstrumentationInfo.PROVIDER.getName(), AndroidInstrumentationInfo.PROVIDER); builder.addSkylarkAccessibleTopLevels( DeviceBrokerInfo.PROVIDER.getName(), DeviceBrokerInfo.PROVIDER); + builder.addSkylarkAccessibleTopLevels( + AndroidResourcesInfo.PROVIDER.getName(), AndroidResourcesInfo.PROVIDER); try { builder.addWorkspaceFilePrefix( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 7d3e4565f1..18685069c4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -569,6 +569,7 @@ public final class AndroidRuleClasses { .cfg(HostTransition.INSTANCE) .exec() .value(env.getToolsLabel(AndroidRuleClasses.MANIFEST_MERGE_TOOL_LABEL))) + .advertiseSkylarkProvider(AndroidResourcesInfo.PROVIDER.id()) .build(); } |