From abeb8515ced94f94e80a0196bd5e8330fefba938 Mon Sep 17 00:00:00 2001 From: cparsons Date: Mon, 11 Jun 2018 12:44:06 -0700 Subject: Migrate android providers to use BuiltinProvider instead of NativeProvider RELNOTES: None. PiperOrigin-RevId: 200096226 --- .../devtools/build/lib/rules/android/AndroidRuleClasses.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java') 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 a9264b0c62..d06c9b2f26 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 @@ -563,8 +563,10 @@ public final class AndroidRuleClasses { attr(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR, LABEL) .cfg(HostTransition.INSTANCE) .value(env.getToolsLabel("//tools/android:databinding_annotation_processor"))) - .advertiseSkylarkProvider(AndroidResourcesInfo.PROVIDER.id()) - .advertiseSkylarkProvider(AndroidNativeLibsInfo.PROVIDER.id()) + .advertiseSkylarkProvider( + SkylarkProviderIdentifier.forKey(AndroidResourcesInfo.PROVIDER.getKey())) + .advertiseSkylarkProvider( + SkylarkProviderIdentifier.forKey(AndroidNativeLibsInfo.PROVIDER.getKey())) .build(); } @@ -1030,7 +1032,7 @@ public final class AndroidRuleClasses { .exec() .value(env.getToolsLabel("//tools/android:zip_filter"))) .removeAttribute("data") - .advertiseSkylarkProvider(ApkInfo.PROVIDER.id()) + .advertiseSkylarkProvider(SkylarkProviderIdentifier.forKey(ApkInfo.PROVIDER.getKey())) .advertiseSkylarkProvider(SkylarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())) .build(); } -- cgit v1.2.3