Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcfe47ba authored by Pierre Lecesne's avatar Pierre Lecesne Committed by Android (Google) Code Review
Browse files

Merge "AAPT2 - Make raw files of type unknown."

parents 70164985 70fdf76c

tools/aapt2/ResourceUtils.cpp

+3 −1
Original line number Diff line number Diff line
@@ -707,7 +707,9 @@ std::unique_ptr<Item> ParseBinaryResValue(const ResourceType& type, const Config 
          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;