diff options
| author | Calin Juravle <calin@google.com> | 2019-11-16 05:47:04 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-16 05:47:04 -0800 |
| commit | a8fdc6c6ec630fb76352eb64590000753ffc328d (patch) | |
| tree | cbb1d4404babde88503d3ad415e80bef86ccdab6 | |
| parent | fbbbd1b3a7999629c4727fff6496a65e81928549 (diff) | |
| parent | 781e508fcdc4bafa19c362005f510072c84bb255 (diff) | |
| download | native-a8fdc6c6ec630fb76352eb64590000753ffc328d.tar.gz | |
Merge "[installd] Improve profile merging error logging"
am: 781e508fcd
Change-Id: I229c83a464145ce66157a0afcda26f33defd2ed9
| -rw-r--r-- | cmds/installd/dexopt.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index 768d900591..616c3b2687 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -708,12 +708,13 @@ static void open_profile_files(uid_t uid, const std::string& package_name, } } -static constexpr int PROFMAN_BIN_RETURN_CODE_COMPILE = 0; -static constexpr int PROFMAN_BIN_RETURN_CODE_SKIP_COMPILATION = 1; -static constexpr int PROFMAN_BIN_RETURN_CODE_BAD_PROFILES = 2; -static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_IO = 3; -static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_LOCKING = 4; -static constexpr int PROFMAN_BIN_RETURN_CODE_SUCCESS = 5; +static constexpr int PROFMAN_BIN_RETURN_CODE_SUCCESS = 0; +static constexpr int PROFMAN_BIN_RETURN_CODE_COMPILE = 1; +static constexpr int PROFMAN_BIN_RETURN_CODE_SKIP_COMPILATION = 2; +static constexpr int PROFMAN_BIN_RETURN_CODE_BAD_PROFILES = 3; +static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_IO = 4; +static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_LOCKING = 5; +static constexpr int PROFMAN_BIN_RETURN_CODE_ERROR_DIFFERENT_VERSIONS = 6; class RunProfman : public ExecVHelper { public: @@ -889,6 +890,11 @@ static bool analyze_profiles(uid_t uid, const std::string& package_name, should_clear_current_profiles = false; should_clear_reference_profile = false; break; + case PROFMAN_BIN_RETURN_CODE_ERROR_DIFFERENT_VERSIONS: + need_to_compile = false; + should_clear_current_profiles = true; + should_clear_reference_profile = true; + break; default: // Unknown return code or error. Unlink profiles. LOG(WARNING) << "Unexpected error code while processing profiles for location " |