commit 3c3f9b5d07a974a2d347210fd59bd19851b2faea
author Izabela Orlowska <imorlowska@google.com> Fri Jan 12 14:24:09 2018 +0000
committer Izabela Orlowska <imorlowska@google.com> Fri Jan 12 14:26:31 2018 +0000
tree 06c4bae7f76f723583fa3b2c8938a502de93d6f6
parent 79131f7a227eb5f2bbd4e6ea29e14d834c634101

AAPT2: always compile 9patch files

Test: existing tests
Bug: 70578281
Change-Id: I7ffcbdd664108348182e71d01b1680e2399ec37c

tools/aapt2/cmd/Compile.cpp

diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp
index 3bec082..101f74e 100644
--- a/tools/aapt2/cmd/Compile.cpp
+++ b/tools/aapt2/cmd/Compile.cpp
@@ -772,8 +772,8 @@
       if (*type != ResourceType::kRaw) {
         if (path_data.extension == "xml") {
           compile_func = &CompileXml;
-        } else if (!options.no_png_crunch &&
-                   (path_data.extension == "png" || path_data.extension == "9.png")) {
+        } else if ((!options.no_png_crunch && path_data.extension == "png") ||
+                   path_data.extension == "9.png") {
           compile_func = &CompilePng;
         }
       }