From 90b7a08aaf189824ec89c99063ae73c0de69fcdf Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Fri, 15 Feb 2019 17:39:58 +0000 Subject: Revert "Fix loaded apk string pool order" This reverts commit 4e9a922ede24f7f7bfe793321f7328623ee2a061. Reason for revert: Change-Id: I3650b2c6c9bdfa69a3034f9ca49e95a9698c3cdd --- tools/aapt2/ResourceUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/ResourceUtils.cpp') diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index ab4805f626a5..0032960ff93e 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -727,7 +727,7 @@ std::unique_ptr ParseBinaryResValue(const ResourceType& type, const Config // This must be a FileReference. std::unique_ptr file_ref = util::make_unique(dst_pool->MakeRef( - str, StringPool::Context(StringPool::Context::kHighPriority, config), data)); + str, StringPool::Context(StringPool::Context::kHighPriority, config))); if (type == ResourceType::kRaw) { file_ref->type = ResourceFile::Type::kUnknown; } else if (util::EndsWith(*file_ref->path, ".xml")) { @@ -739,7 +739,7 @@ std::unique_ptr ParseBinaryResValue(const ResourceType& type, const Config } // There are no styles associated with this string, so treat it as a simple string. - return util::make_unique(dst_pool->MakeRef(str, StringPool::Context(config), data)); + return util::make_unique(dst_pool->MakeRef(str, StringPool::Context(config))); } } break; -- cgit v1.2.3-59-g8ed1b