commit 62b68341e8c9cb7a57da99413f5d3d52373e85e0
author Ryan Mitchell <rtmitchell@google.com> Mon Mar 11 13:28:02 2019 -0700
committer Ryan Mitchell <rtmitchell@google.com> Mon Mar 11 13:28:02 2019 -0700
tree 82db377034a3f76cc74a37abb1b56a357b233520
parent 41469c3b522f28c4590398ad6e35193b2142dda7

Compile all files in res/xml as xml

AAPT(1) compiled all files in res/xml as xml. Continue to do the same to
prevent regressions.

Bug: 122321161
Test: manual
Change-Id: I99c80da6d304c13ce911cd5258fd561f3c9e91b4

tools/aapt2/cmd/Compile.cpp

diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp
index 42dc74c..2ec1ab3 100644
--- a/tools/aapt2/cmd/Compile.cpp
+++ b/tools/aapt2/cmd/Compile.cpp
@@ -678,7 +678,7 @@
 
     } else if (const ResourceType* type = ParseResourceType(path_data.resource_dir)) {
       if (*type != ResourceType::kRaw) {
-        if (path_data.extension == "xml") {
+        if (*type == ResourceType::kXml || path_data.extension == "xml") {
           compile_func = &CompileXml;
         } else if ((!options.no_png_crunch && path_data.extension == "png")
                    || path_data.extension == "9.png") {