Add a resource validator action for android_library

Part 3 of the 3 new proposed android_library res
processing actions. Pulls a zip file from the
merging action, unpacks it, and then validates
the results with aapt. Get an R.txt and srcjar
w/ javadocs from aapt. In order to the get the
R.txt, I think you need to ask for the R.java
sources anyway.

Split the processResources() into a runAapt()
function that can be reused.

Hookup in bazel coming separately.

--
MOS_MIGRATED_REVID=131618410

1 files changed, 1 insertions, 9 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index cc78940086..322180b1a2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -13,8 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.android;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import com.android.builder.core.VariantConfiguration;
 import com.android.builder.core.VariantConfiguration.Type;
 import com.android.ide.common.internal.AaptCruncher;
@@ -38,7 +36,6 @@ import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.TriState;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -283,12 +280,7 @@ public class AndroidResourceProcessingAction {
       }
 
       if (options.packageType == Type.LIBRARY) {
-        Files.createDirectories(dummyManifest.getParent());
-        Files.write(dummyManifest, String.format(
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-            + "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\""
-            + " package=\"%s\">"
-            + "</manifest>", options.packageForR).getBytes(UTF_8));
+        resourceProcessor.writeDummyManifestForAapt(dummyManifest, options.packageForR);
         processedData = new MergedAndroidData(
             processedData.getResourceDir(),
             processedData.getAssetDir(),