diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-09-25 13:10:14 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-09-25 18:24:41 -0700 |
| commit | 03ebac8c68f9925592a172fcfd11d56f48cadaeb (patch) | |
| tree | 65f977d44096c415c580614dd43a158d3b96aa23 /libs/androidfw/ApkAssets.cpp | |
| parent | 6833a07a078af8eeb868aee269bbb1860c01f244 (diff) | |
A few fixes to AssetManager2 for compat
Theme copying should behave the way it did with the old AssetManager
(copy only the framework attributes when copying from a Theme object
from a different AssetManager).
Cleanup the dependencies on libziparchive in ApkAssets.
Test: make libandroidfw_tests
Test: out/host/<platform>/nativetests64/libandroidfw_tests/libandroidfw_tests --testdata=frameworks/base/libs/androidfw/tests/data
Change-Id: I973f7e6eb14ce311306e2ec66a623a4790c8d233
Diffstat (limited to 'libs/androidfw/ApkAssets.cpp')
| -rw-r--r-- | libs/androidfw/ApkAssets.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index a5b1d29dbf91..0e577d1c9e3c 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -30,6 +30,8 @@ namespace android { +ApkAssets::ApkAssets() : zip_handle_(nullptr, ::CloseArchive) {} + std::unique_ptr<const ApkAssets> ApkAssets::Load(const std::string& path, bool system) { return ApkAssets::LoadImpl(path, system, false /*load_as_shared_library*/); } |