diff options
author | 2018-08-14 22:51:35 +0000 | |
---|---|---|
committer | 2018-08-14 22:51:35 +0000 | |
commit | 1a8a69075e8710b3457f685de3984c7028ef2ffb (patch) | |
tree | bfa1feaf4b5242f1066079236bf864556abc7795 /tools/aapt2/LoadedApk.cpp | |
parent | 14590e6d0e3b6d885be97f0635c1538a0c49cb6e (diff) | |
parent | 83a37adfbb3c9fc139cc7881995ddd63db4caff8 (diff) |
Merge "AAPT2: Loosen loading apk format requirements"
Diffstat (limited to 'tools/aapt2/LoadedApk.cpp')
-rw-r--r-- | tools/aapt2/LoadedApk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/LoadedApk.cpp b/tools/aapt2/LoadedApk.cpp index 1dd46ba813db..b32766be8d18 100644 --- a/tools/aapt2/LoadedApk.cpp +++ b/tools/aapt2/LoadedApk.cpp @@ -76,7 +76,7 @@ std::unique_ptr<LoadedApk> LoadedApk::LoadProtoApkFromFileCollection( } std::string error; - table = util::make_unique<ResourceTable>(); + table = util::make_unique<ResourceTable>(/** validate_resources **/ false); if (!DeserializeTableFromPb(pb_table, collection.get(), table.get(), &error)) { diag->Error(DiagMessage(source) << "failed to deserialize " << kProtoResourceTablePath << ": " << error); @@ -120,7 +120,7 @@ std::unique_ptr<LoadedApk> LoadedApk::LoadBinaryApkFromFileCollection( io::IFile* table_file = collection->FindFile(kApkResourceTablePath); if (table_file != nullptr) { - table = util::make_unique<ResourceTable>(); + table = util::make_unique<ResourceTable>(/** validate_resources **/ false); std::unique_ptr<io::IData> data = table_file->OpenAsData(); if (data == nullptr) { diag->Error(DiagMessage(source) << "failed to open " << kApkResourceTablePath); |