diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-03-20 18:21:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-20 18:21:20 +0000 |
| commit | c5f968d58b839115c649374deb16190ee80151f6 (patch) | |
| tree | 46a755cc01078200cd5f02f618237e203328acca /libs/androidfw/tests/AssetManager2_test.cpp | |
| parent | 85ded38f799020756024bce6ef07fe10dde8ffa5 (diff) | |
| parent | b0544a733cc73522c7cef2a114eefe65552627f0 (diff) | |
Merge changes from topic "res_loader_dir" into rvc-dev am: b0544a733c
Change-Id: I18c28c7293a24d712940c9e80e7817f9547512f8
Diffstat (limited to 'libs/androidfw/tests/AssetManager2_test.cpp')
| -rw-r--r-- | libs/androidfw/tests/AssetManager2_test.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp index 35fea7ab86cb..ac32699c6dfd 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -63,10 +63,12 @@ class AssetManager2Test : public ::testing::Test { libclient_assets_ = ApkAssets::Load(GetTestDataPath() + "/libclient/libclient.apk"); ASSERT_NE(nullptr, libclient_assets_); - appaslib_assets_ = ApkAssets::LoadAsSharedLibrary(GetTestDataPath() + "/appaslib/appaslib.apk"); + appaslib_assets_ = ApkAssets::Load(GetTestDataPath() + "/appaslib/appaslib.apk", + PROPERTY_DYNAMIC); ASSERT_NE(nullptr, appaslib_assets_); - system_assets_ = ApkAssets::Load(GetTestDataPath() + "/system/system.apk", true /*system*/); + system_assets_ = ApkAssets::Load(GetTestDataPath() + "/system/system.apk", + PROPERTY_SYSTEM); ASSERT_NE(nullptr, system_assets_); app_assets_ = ApkAssets::Load(GetTestDataPath() + "/app/app.apk"); |