Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pierre Lecesne
2017-11-27 23:04:33 +00:00
committed by Android (Google) Code Review
parent 70164985f5 70fdf76c52
commit dcfe47bac2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt2/ResourceUtils.cpp
View File

@@ -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;