commit 70fdf76c52224217179529be868c47b3194f1551
author Pierre Lecesne <lecesne@google.com> Mon Nov 27 19:29:42 2017 +0000
committer Pierre Lecesne <lecesne@google.com> Mon Nov 27 19:33:47 2017 +0000
tree 9ca3710214c5e292136989e0332681a293b1cc46
parent 15176cd986b0970c636036f60e97d5be53f3ce91

AAPT2 - Make raw files of type unknown.

Bug: 69791607
Test: Manual.

Change-Id: I6ee5ef37fb447ab79d46b57e0dc4eaad84eec723

tools/aapt2/ResourceUtils.cpp

diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp
index 24187d9..02ac86c 100644
--- a/tools/aapt2/ResourceUtils.cpp
+++ b/tools/aapt2/ResourceUtils.cpp
@@ -707,7 +707,9 @@
           std::unique_ptr<FileReference> file_ref =
               util::make_unique<FileReference>(dst_pool->MakeRef(
                   str, StringPool::Context(StringPool::Context::kHighPriority, config)));
-          if (util::EndsWith(*file_ref->path, ".xml")) {
+          if (type == ResourceType::kRaw) {
+            file_ref->type = ResourceFile::Type::kUnknown;
+          } else if (util::EndsWith(*file_ref->path, ".xml")) {
             file_ref->type = ResourceFile::Type::kBinaryXml;
           } else if (util::EndsWith(*file_ref->path, ".png")) {
             file_ref->type = ResourceFile::Type::kPng;