summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Izabela Orlowska <imorlowska@google.com> 2018-01-12 18:06:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-12 18:06:40 +0000
commit94b5ade02ad9b40b4baba73840c770718767151f (patch)
treec2cd64036836e17ba27eb285c65f78d872bb02c5
parent200cd63fb3ff5b4354773e9994f4340f18b39cbc (diff)
parent3c3f9b5d07a974a2d347210fd59bd19851b2faea (diff)
Merge "AAPT2: always compile 9patch files"
-rw-r--r--tools/aapt2/cmd/Compile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp
index 3bec082fc57a..101f74eafaf4 100644
--- a/tools/aapt2/cmd/Compile.cpp
+++ b/tools/aapt2/cmd/Compile.cpp
@@ -772,8 +772,8 @@ int Compile(const std::vector<StringPiece>& args, IDiagnostics* diagnostics) {
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;
}
}