commit 8c2df71739808d6f1aec4277fb47c191e7031164
author Guang Zhu <guangzhu@google.com> Tue Mar 21 03:53:43 2017 +0000
committer Guang Zhu <guangzhu@google.com> Tue Mar 21 03:53:43 2017 +0000
tree fcd72bd33919422f7c4810c2f71731f76d238806
parent c7614e5d1e8f9139cccf6ab9b78dda16b98f7656

Revert "AAPT: Version <adaptive-icon> to v26"

Bug: 36462965
Bug: 35908647

This reverts commit c7614e5d1e8f9139cccf6ab9b78dda16b98f7656.

Change-Id: I25279e7c53823dad0703c7e2ea8ff91bdbc1a0f2

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index fdcc7aa..15648bd 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -2501,21 +2501,14 @@
         const size_t numConfigs = gp->getFiles().size();
         for (size_t j = 0; j < numConfigs; j++) {
             status_t err = NO_ERROR;
-            const sp<AaptFile>& file = gp->getFiles().valueAt(j);
-            if (!file->hasData()) {
-              // Empty files do not get written.
-              continue;
-            }
-
             if (ignoreConfig) {
-                err = builder->getBaseSplit()->addEntry(gp->getPath(), file);
+                err = builder->getBaseSplit()->addEntry(gp->getPath(), gp->getFiles().valueAt(j));
             } else {
-                err = builder->addEntry(gp->getPath(), file);
+                err = builder->addEntry(gp->getPath(), gp->getFiles().valueAt(j));
             }
-
             if (err != NO_ERROR) {
                 fprintf(stderr, "Failed to add %s (%s) to builder.\n",
-                        gp->getPath().string(), file->getPrintableSource().string());
+                        gp->getPath().string(), gp->getFiles()[j]->getPrintableSource().string());
                 return err;
             }
         }