diff options
| -rw-r--r-- | cmds/installd/dexopt.cpp | 7 | ||||
| -rw-r--r-- | cmds/installd/dexopt.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index 0fd2dd4afd..03a411d849 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -1692,15 +1692,12 @@ static bool process_secondary_dexoptanalyzer_result(const std::string& dex_path, *dexopt_needed_out = NO_DEXOPT_NEEDED; return true; case 1: // dexoptanalyzer: dex2oat_from_scratch *dexopt_needed_out = DEX2OAT_FROM_SCRATCH; return true; - case 5: // dexoptanalyzer: dex2oat_for_bootimage_odex + case 4: // dexoptanalyzer: dex2oat_for_bootimage_odex *dexopt_needed_out = -DEX2OAT_FOR_BOOT_IMAGE; return true; - case 6: // dexoptanalyzer: dex2oat_for_filter_odex + case 5: // dexoptanalyzer: dex2oat_for_filter_odex *dexopt_needed_out = -DEX2OAT_FOR_FILTER; return true; - case 7: // dexoptanalyzer: dex2oat_for_relocation_odex - *dexopt_needed_out = -DEX2OAT_FOR_RELOCATION; return true; case 2: // dexoptanalyzer: dex2oat_for_bootimage_oat case 3: // dexoptanalyzer: dex2oat_for_filter_oat - case 4: // dexoptanalyzer: dex2oat_for_relocation_oat *error_msg = StringPrintf("Dexoptanalyzer return the status of an oat file." " Expected odex file status for secondary dex %s" " : dexoptanalyzer result=%d", diff --git a/cmds/installd/dexopt.h b/cmds/installd/dexopt.h index bb6fab311b..0db11e1e7b 100644 --- a/cmds/installd/dexopt.h +++ b/cmds/installd/dexopt.h @@ -31,7 +31,6 @@ static constexpr int NO_DEXOPT_NEEDED = 0; static constexpr int DEX2OAT_FROM_SCRATCH = 1; static constexpr int DEX2OAT_FOR_BOOT_IMAGE = 2; static constexpr int DEX2OAT_FOR_FILTER = 3; -static constexpr int DEX2OAT_FOR_RELOCATION = 4; // Clear the reference profile identified by the given profile name. bool clear_primary_reference_profile(const std::string& pkgname, const std::string& profile_name); |