diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2018-10-17 09:30:01 -0700 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2018-10-17 09:30:01 -0700 |
| commit | ec74f2fbd56a5021ab7c74bd7e65c165e287ad7f (patch) | |
| tree | 02a209b2729d37ee6d2453f543b9d84ad80a7b11 /tools/aapt2/LoadedApk.h | |
| parent | bbcfda0d35e83b95b2acc742c36ced3f92700ce9 (diff) | |
Fix incorrect proto apk loading
If a proto apk is missing resources.pb, AAPT2 would fail to detrmine the
apk format because of an incorrect check. This fixes that check and
removes the checking fuction from the LoadedApk header.
Bug: 117820549
Test: removed resources.pb from proto apks and confirmed that loading in
apks still works
Change-Id: If3628a821e7b59c7dfcbefb502b6080be083cec1
Diffstat (limited to 'tools/aapt2/LoadedApk.h')
| -rw-r--r-- | tools/aapt2/LoadedApk.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/aapt2/LoadedApk.h b/tools/aapt2/LoadedApk.h index 84c57c14474a..5b6f45ebb38d 100644 --- a/tools/aapt2/LoadedApk.h +++ b/tools/aapt2/LoadedApk.h @@ -121,8 +121,6 @@ class LoadedApk { std::unique_ptr<ResourceTable> table_; std::unique_ptr<xml::XmlResource> manifest_; ApkFormat format_; - - static ApkFormat DetermineApkFormat(io::IFileCollection* apk); }; } // namespace aapt |