Adds the --no-version-vectors as a default flag for aapt processing.

--
MOS_MIGRATED_REVID=113663618

1 files changed, 6 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index d0a6962ac6..dbea2d3405 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -177,13 +177,16 @@ public class AndroidResourceProcessor {
     if (stdLogger.getLevel() == StdLogger.Level.VERBOSE) {
         command.add("-v");
     }
-
+    
     // Overwrite existing files, if they exist.
     command.add("-f");
-
+    
     // Resources are precrunched in the merge process.
     command.add("--no-crunch");
 
+    // Do not automatically generate versioned copies of vector XML resources.
+    command.add("--no-version-vectors");
+
     // Add the android.jar as a base input.
     command.add("-I");
     command.add(androidJar.toString());
@@ -238,7 +241,7 @@ public class AndroidResourceProcessor {
       command.add("--non-constant-id");
     }
 
-    if (variantType == VariantConfiguration.Type.DEFAULT && !packages.isEmpty()) {
+    if (variantType == VariantConfiguration.Type.DEFAULT) {
       // Generate the dependent R and Manifest files.
       command.add("--extra-packages");
       command.add(Joiner.on(":").join(packages));