Make aar_import use the java package from the manifest for all aapt resource rules.

The AndroidResourcesProcessorBuilder, AndroidResourceValidatorActionBuilder and AndroidResourceMergingActionBuilder that use the java package specified by the AndroidResourceProvider check if it is not null or empty before using it and default to using the package from the manifest. This CL just allows us to pass null java package from AndroidSdkProvider and does so with aar_import.

--
MOS_MIGRATED_REVID=133883286

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProvider.java
index 999584015d..dd117d9697 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProvider.java
@@ -77,7 +77,7 @@ public abstract class AndroidResourcesProvider implements TransitiveInfoProvider
 
     public static ResourceContainer create(
         Label label,
-        String javaPackage,
+        @Nullable String javaPackage,
         @Nullable String renameManifestPackage,
         boolean constantsInlined,
         @Nullable Artifact apk,
@@ -110,7 +110,7 @@ public abstract class AndroidResourcesProvider implements TransitiveInfoProvider
     }
 
     public abstract Label getLabel();
-    public abstract String getJavaPackage();
+    @Nullable public abstract String getJavaPackage();
     @Nullable public abstract String getRenameManifestPackage();
     public abstract boolean getConstantsInlined();
     @Nullable public abstract Artifact getApk();