Make Android rules work again

They were broken by commit 05e2c5b4e0da2f88e12d95adbc63cc3d46a6fca6.

--
MOS_MIGRATED_REVID=102546907

1 files changed, 3 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
index e1f84e7feb..2b5e999a66 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
@@ -89,12 +89,10 @@ public final class ApplicationManifest {
       return ruleContext.attributes().get("application_id", Type.STRING);
     }
 
-    TransitiveInfoCollection resourcesPrerequisite =
-        ruleContext.getPrerequisite("resources", Mode.TARGET);
-    if (resourcesPrerequisite != null) {
+    AndroidResourcesProvider resourcesProvider = AndroidCommon.getAndroidResources(ruleContext);
+    if (resourcesProvider != null) {
       ResourceContainer resourceContainer = Iterables.getOnlyElement(
-          resourcesPrerequisite.getProvider(AndroidResourcesProvider.class)
-          .getTransitiveAndroidResources());
+          resourcesProvider.getTransitiveAndroidResources());
       return resourceContainer.getRenameManifestPackage();
     } else {
       return null;