Parse layout/menu/drawable, etc XML files for R.id

To be used by a later CL where we use this more
complete picture of all the resource items to
generate our own R.java/class without invoking
AAPT (and split out AAPT to a separate action
that is off the java builder critical path).

Technically aapt creates R.id.foo for attr
<enum name="foo" ... /> and flag as well, but
I haven't seen code that actually relies on that.

Currently off-by-default (only exercised by tests).

--
MOS_MIGRATED_REVID=126407838

1 files changed, 8 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
index 32c9a23155..3f74e81d9a 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
@@ -48,7 +48,7 @@ public class AndroidDataMerger {
 
   private static final Logger logger = Logger.getLogger(AndroidDataMerger.class.getCanonicalName());
 
-  private final class ParseDependencyDataTask implements Callable<Boolean> {
+  private static final class ParseDependencyDataTask implements Callable<Boolean> {
 
     private final AndroidDataSerializer serializer;
 
@@ -157,6 +157,7 @@ public class AndroidDataMerger {
 
   private final SourceChecker deDuplicator;
   private final ListeningExecutorService executorService;
+  private boolean parseIds;
 
   /** Creates a merger with no path deduplication and a default {@link ExecutorService}. */
   public static AndroidDataMerger createWithDefaults() {
@@ -186,6 +187,10 @@ public class AndroidDataMerger {
     this.executorService = executorService;
   }
 
+  void enableIdParsing() {
+    this.parseIds = true;
+  }
+
   /**
    * Merges a list of {@link DependencyAndroidData} with a {@link UnvalidatedAndroidData}.
    *
@@ -299,7 +304,8 @@ public class AndroidDataMerger {
 
     try {
       // Extract the primary resources.
-      ParsedAndroidData parsedPrimary = ParsedAndroidData.from(primaryData);
+      ParsedAndroidData parsedPrimary = parseIds ? ParsedAndroidData.parseWithIds(primaryData)
+          : ParsedAndroidData.from(primaryData);
 
       // Create the builders for the final parsed data.
       final ParsedAndroidData.Builder primaryBuilder = ParsedAndroidData.Builder.newBuilder();