| commit | 42e4b351727e7acb459d05b9b78c74b6e1380207 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Tue Mar 30 13:57:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 30 13:57:32 2021 +0000 |
| tree | 9585f290737fcc18a38f24cbca13a33a3efe97ce | |
| parent | 9fbf1ca2fbc91e7e79f8593eebbf93e954ca3ec0 [diff] | |
| parent | 73bbda19dbc9462e11592474c7cabc7e40846097 [diff] |
Merge "Fix #2 for dexopt_test now that '&' is not a valid class loader context." am: c374340c82 am: 73bbda19db Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1655677 Change-Id: I20bdfb137b394814522f48e0c294d9880ff0e232
diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp index 6e1757e..e272025 100644 --- a/cmds/installd/tests/installd_dexopt_test.cpp +++ b/cmds/installd/tests/installd_dexopt_test.cpp
@@ -478,7 +478,7 @@ bool should_binder_call_succeed, /*out */ binder::Status* binder_result) { std::optional<std::string> out_path = oat_dir ? std::make_optional<std::string>(oat_dir) : std::nullopt; - std::string class_loader_context = "&"; + std::string class_loader_context = "PCL[]"; int32_t target_sdk_version = 0; // default std::string profile_name = "primary.prof"; std::optional<std::string> dm_path_opt = dm_path ? std::make_optional<std::string>(dm_path) : std::nullopt;