Flip on @+id parsing by default

Avoid writing the non-values IdXmlResourceValues
to the merged values.xml file. It's redundant
since the merged resources will include the src
layout / menu, etc. file. E.g., adds 25KB out
of 250KB to some merged values.xml.

It can also change the way R.fields are initialized
(ids from values.xml are numbered before other
sources), that would have changed the numbering in
AndroidIntegratinoTest#testAndroidBinaryResourceShrinking
and in AndroidResourceClassWriterAaptTest.

--
MOS_MIGRATED_REVID=130789333

1 files changed, 1 insertions, 7 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 3cd7d2c45f..f330b95f9e 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
@@ -157,7 +157,6 @@ 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() {
@@ -187,10 +186,6 @@ public class AndroidDataMerger {
     this.executorService = executorService;
   }
 
-  void enableIdParsing() {
-    this.parseIds = true;
-  }
-
   /**
    * Merges a list of {@link DependencyAndroidData} with a {@link UnvalidatedAndroidData}.
    *
@@ -304,8 +299,7 @@ public class AndroidDataMerger {
 
     try {
       // Extract the primary resources.
-      ParsedAndroidData parsedPrimary = parseIds ? ParsedAndroidData.parseWithIds(primaryData)
-          : ParsedAndroidData.from(primaryData);
+      ParsedAndroidData parsedPrimary = ParsedAndroidData.from(primaryData);
 
       // Create the builders for the final parsed data.
       final ParsedAndroidData.Builder primaryBuilder = ParsedAndroidData.Builder.newBuilder();