Fix up newly discovered bugs in decoupled Android data processing

- Always generate a symbols file - the new resource processing pipeline likes
  knowing that this is non-null, and it shouldn't cost much extra to create.

- A misleading method signature (which I made) led to me forgetting about
  Proguard artifacts. Properly propogate them into the ResourceApk object.

- Don't get Aapt version directly from AndroidConfiguration - there's some
  additional logic in AndroidAaptVersion not exposed elsewhere

- Split library tests that expect resources and assets to be processed together
  to have a new version where they're processed seperately.

- Tests use ValidatedAndroidData interface rather than ResourceContainer object

- Properly move some LocalTest magic around resource JAR out of the old
  pipeline only, as it should apply to both old and new pipelines.

- Processing action defaults to empty resource and asset deps rather than null

RELNOTES: none
PiperOrigin-RevId: 195253161

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
index 6f324cd2b2..05a9cc32e1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
@@ -125,9 +125,10 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor
                   : null,
               null, /* featureOfArtifact */
               null /* featureAfterArtifact */);
-      attributesBuilder.addRuntimeClassPathEntry(resourceApk.getResourceJavaClassJar());
     }
 
+    attributesBuilder.addRuntimeClassPathEntry(resourceApk.getResourceJavaClassJar());
+
     // Exclude the Rs from the library from the runtime classpath.
     NestedSet<Artifact> excludedRuntimeArtifacts = getLibraryResourceJars(ruleContext);
     attributesBuilder.addExcludedArtifacts(excludedRuntimeArtifacts);