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, 49 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
index 15c551f6a5..abe1dfd395 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
@@ -20,7 +20,9 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.android.xml.StyleableXmlResourceValue;
 
+import com.android.SdkConstants;
 import com.android.ide.common.res2.MergingException;
+import com.android.resources.FolderTypeRelationship;
 import com.android.resources.ResourceFolderType;
 
 import java.io.IOException;
@@ -31,6 +33,7 @@ import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -63,6 +66,7 @@ public class ParsedAndroidData {
     private final Map<DataKey, DataAsset> assets;
     private final Set<MergeConflict> conflicts;
     private final List<Exception> errors = new ArrayList<>();
+    private boolean parseIds;
 
     public Builder(
         Map<DataKey, DataResource> overwritingResources,
@@ -83,6 +87,11 @@ public class ParsedAndroidData {
       return new Builder(overwritingResources, combiningResources, assets, conflicts);
     }
 
+    Builder enableIdParsing() {
+      this.parseIds = true;
+      return this;
+    }
+
     private void checkForErrors() throws MergingException {
       if (!errors.isEmpty()) {
         MergingException mergingException = new MergingException("Parse Error(s)");
@@ -121,7 +130,8 @@ public class ParsedAndroidData {
       return new ResourceFileVisitor(
           new OverwritableConsumer<>(overwritingResources, conflicts),
           new CombiningConsumer(combiningResources),
-          errors);
+          errors,
+          parseIds);
     }
 
     AssetFileVisitor assetVisitorFor(Path path) {
@@ -248,14 +258,28 @@ public class ParsedAndroidData {
     private ResourceFolderType folderType;
     private FullyQualifiedName.Factory fqnFactory;
     private final XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory();
+    private final boolean parseIds;
+
+    /**
+     * Resource folders with XML files that may contain "@+id".
+     * See android_ide_common's {@link FolderTypeRelationship}.
+     */
+    private static final EnumSet<ResourceFolderType> ID_PROVIDING_RESOURCE_TYPES = EnumSet.of(
+        ResourceFolderType.DRAWABLE,
+        ResourceFolderType.LAYOUT,
+        ResourceFolderType.MENU,
+        ResourceFolderType.TRANSITION,
+        ResourceFolderType.XML);
 
     ResourceFileVisitor(
         KeyValueConsumer<DataKey, DataResource> overwritingConsumer,
         KeyValueConsumer<DataKey, DataResource> combiningResources,
-        List<Exception> errors) {
+        List<Exception> errors,
+        boolean parseIds) {
       this.overwritingConsumer = overwritingConsumer;
       this.combiningResources = combiningResources;
       this.errors = errors;
+      this.parseIds = parseIds;
     }
 
     private static String deriveRawFullyQualifiedName(Path path) {
@@ -303,7 +327,14 @@ public class ParsedAndroidData {
           } else if (folderType != null) {
             String rawFqn = deriveRawFullyQualifiedName(path);
             FullyQualifiedName key = fqnFactory.parse(rawFqn);
-            overwritingConsumer.consume(key, DataValueFile.of(path));
+            if (parseIds
+                && ID_PROVIDING_RESOURCE_TYPES.contains(folderType)
+                && path.getFileName().toString().endsWith(SdkConstants.DOT_XML)) {
+              DataValueFileWithIds.parse(
+                  xmlInputFactory, path, key, fqnFactory, overwritingConsumer, combiningResources);
+            } else {
+              overwritingConsumer.consume(key, DataValueFile.of(path));
+            }
           }
         }
       } catch (IllegalArgumentException | XMLStreamException e) {
@@ -361,6 +392,21 @@ public class ParsedAndroidData {
     return pathWalker.createParsedAndroidData();
   }
 
+  /**
+   * Parses resource symbols including "@+id/resourceName" (optional for now).
+   *
+   * @see ParsedAndroidData#from(UnvalidatedAndroidData)
+   */
+  @VisibleForTesting
+  static ParsedAndroidData parseWithIds(UnvalidatedAndroidData primary)
+      throws IOException, MergingException {
+    Builder builder = Builder.newBuilder().enableIdParsing();
+    final ParsedAndroidDataBuildingPathWalker pathWalker =
+        ParsedAndroidDataBuildingPathWalker.create(builder);
+    primary.walk(pathWalker);
+    return pathWalker.createParsedAndroidData();
+  }
+
   private final ImmutableSet<MergeConflict> conflicts;
   private final ImmutableMap<DataKey, DataResource> overwritingResources;
   private final ImmutableMap<DataKey, DataResource> combiningResources;