Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e796939 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Automerger Merge Worker
Browse files

Merge "Fix #2 for dexopt_test now that '&' is not a valid class loader... 

Merge "Fix #2 for dexopt_test now that '&' is not a valid class loader context." am: c374340c am: 73bbda19 am: 42e4b351

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1655677

Change-Id: I269a3e7c6c00008ae319741fdfc25a13773e2078
parents 0b5c7df5 42e4b351

cmds/installd/tests/installd_dexopt_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ protected: 
                           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;