From 3b760aff0f617607af1b2c0672ad89bc37e96421 Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Thu, 1 Feb 2018 15:19:31 -0800
Subject: PiperOrigin-RevId: 184203570

---
 .../google/devtools/build/lib/rules/android/AndroidCommon.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index e9064e9400..f6357eaee3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -743,6 +743,8 @@ public class AndroidCommon {
         .setNeverlink(isNeverlink)
         .build();
 
+    AndroidResourcesInfo resourceInfo = resourceApk.toResourceInfo(ruleContext.getLabel());
+
     return builder
         .setFilesToBuild(filesToBuild)
         .addSkylarkTransitiveInfo(
@@ -752,9 +754,7 @@ public class AndroidCommon {
             JavaRuntimeJarProvider.class,
             new JavaRuntimeJarProvider(javaCommon.getJavaCompilationArtifacts().getRuntimeJars()))
         .addProvider(RunfilesProvider.class, RunfilesProvider.simple(getRunfiles()))
-        .addProvider(
-            AndroidResourcesProvider.class,
-            resourceApk.toResourceProvider(ruleContext.getLabel()))
+        .addNativeDeclaredProvider(resourceInfo)
         .addProvider(
             AndroidIdeInfoProvider.class,
             createAndroidIdeInfoProvider(
@@ -766,7 +766,8 @@ public class AndroidCommon {
                 zipAlignedApk,
                 apksUnderTest,
                 nativeLibs))
-        .addSkylarkTransitiveInfo(AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider())
+        .addSkylarkTransitiveInfo(
+            AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider(resourceInfo))
         .addOutputGroup(
             OutputGroupInfo.HIDDEN_TOP_LEVEL, collectHiddenTopLevelArtifacts(ruleContext))
         .addOutputGroup(
-- 
cgit v1.2.3