From 656a577a34bfbb68d4f1557bfdaa8c2f2b6f8723 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Thu, 14 Jan 2016 15:17:41 -0800
Subject: [PATCH] AAPT2: Accept zip, jack, jar, and flata extensions as
 archives

Change-Id: I3a4db129998e2351e8221f9d72a4b40d2c7a8cf9
---
 tools/aapt2/link/Link.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/aapt2/link/Link.cpp b/tools/aapt2/link/Link.cpp
index 2a4c020c72fb9..51b9cecb7b7ee 100644
--- a/tools/aapt2/link/Link.cpp
+++ b/tools/aapt2/link/Link.cpp
@@ -523,7 +523,10 @@ public:
     }
 
     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);
         }