diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-26 01:41:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-26 01:41:49 +0000 |
| commit | c0c5fae60327a46587aef7d62261b2ff3b35a9f4 (patch) | |
| tree | 5cfaf0b76569a51c7c92fc6550904d8ada281bc8 | |
| parent | 75dbd5e96c2a48412989121771c476e7941a464d (diff) | |
| parent | 6c857b713f8d0fbad7ef8989011e6ae2922b70a7 (diff) | |
| download | native-c0c5fae60327a46587aef7d62261b2ff3b35a9f4.tar.gz | |
Merge "Make otapreopt actually print dexopt error messages"
| -rw-r--r-- | cmds/installd/otapreopt.cpp | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index 443821c3b9..ef052bd928 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -473,24 +473,29 @@ private: // Run dexopt with the parameters of parameters_. // TODO(calin): embed the profile name in the parameters. int Dexopt() { - std::string dummy; - return dexopt(parameters_.apk_path, - parameters_.uid, - parameters_.pkgName, - parameters_.instruction_set, - parameters_.dexopt_needed, - parameters_.oat_dir, - parameters_.dexopt_flags, - parameters_.compiler_filter, - parameters_.volume_uuid, - parameters_.shared_libraries, - parameters_.se_info, - parameters_.downgrade, - parameters_.target_sdk_version, - parameters_.profile_name, - parameters_.dex_metadata_path, - parameters_.compilation_reason, - &dummy); + std::string error; + int res = dexopt(parameters_.apk_path, + parameters_.uid, + parameters_.pkgName, + parameters_.instruction_set, + parameters_.dexopt_needed, + parameters_.oat_dir, + parameters_.dexopt_flags, + parameters_.compiler_filter, + parameters_.volume_uuid, + parameters_.shared_libraries, + parameters_.se_info, + parameters_.downgrade, + parameters_.target_sdk_version, + parameters_.profile_name, + parameters_.dex_metadata_path, + parameters_.compilation_reason, + &error); + if (res != 0) { + LOG(ERROR) << "During preopt of " << parameters_.apk_path << " got result " << res + << " error: " << error; + } + return res; } int RunPreopt() { |