commit 95d2c302d5311da3bf94ecda65a4b907927bf227
author Ryan Mitchell <rtmitchell@google.com> Mon Mar 25 15:49:14 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 25 15:49:14 2019 +0000
tree 5def11b5d615d614f29a366fc63fa732fdb1b4c3
parent cc2be1ecfb2d83fc2d6fb5e67c6b0f4d4cd1c937
parent 62b68341e8c9cb7a57da99413f5d3d52373e85e0

Merge "Compile all files in res/xml as xml"

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") {