commit 656a577a34bfbb68d4f1557bfdaa8c2f2b6f8723
author Adam Lesinski <adamlesinski@google.com> Thu Jan 14 15:17:41 2016 -0800
committer Adam Lesinski <adamlesinski@google.com> Thu Jan 14 15:17:41 2016 -0800
tree 02a6e5aa8044eaec2fc0c025c9d312b5d9123848
parent 44859db74bb1cc2341524c5484cc3e765ec42c42

AAPT2: Accept zip, jack, jar, and flata extensions as archives

Change-Id: I3a4db129998e2351e8221f9d72a4b40d2c7a8cf9

tools/aapt2/link/Link.cpp

diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/link/Link.cpp
index 2a4c020..51b9cec 100644
--- a/tools/aapt2/link/Link.cpp
+++ b/tools/aapt2/link/Link.cpp
@@ -523,7 +523,10 @@
     }
 
     bool processFile(const std::string& path, bool override) {
-        if (util::stringEndsWith<char>(path, ".flata")) {
+        if (util::stringEndsWith<char>(path, ".flata") ||
+                util::stringEndsWith<char>(path, ".jar") ||
+                util::stringEndsWith<char>(path, ".jack") ||
+                util::stringEndsWith<char>(path, ".zip")) {
             return mergeArchive(path, override);
         }