diff options
| -rw-r--r-- | cmds/installd/dexopt.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index f0c1985ce8..3710e6bcfa 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -1149,8 +1149,8 @@ Dex2oatFileWrapper maybe_open_reference_profile(const std::string& pkgname, // Opens the vdex files and assigns the input fd to in_vdex_wrapper_fd and the output fd to // out_vdex_wrapper_fd. Returns true for success or false in case of errors. bool open_vdex_files(const char* apk_path, const char* out_oat_path, int dexopt_needed, - const char* instruction_set, bool is_public, bool profile_guided, - int uid, bool is_secondary_dex, Dex2oatFileWrapper* in_vdex_wrapper_fd, + const char* instruction_set, bool is_public, int uid, bool is_secondary_dex, + Dex2oatFileWrapper* in_vdex_wrapper_fd, Dex2oatFileWrapper* out_vdex_wrapper_fd) { CHECK(in_vdex_wrapper_fd != nullptr); CHECK(out_vdex_wrapper_fd != nullptr); @@ -1160,9 +1160,7 @@ bool open_vdex_files(const char* apk_path, const char* out_oat_path, int dexopt_ int dexopt_action = abs(dexopt_needed); bool is_odex_location = dexopt_needed < 0; std::string in_vdex_path_str; - // Disable passing an input vdex when the compilation is profile-guided. The dexlayout - // optimization in dex2oat is incompatible with it. b/35872504. - if (dexopt_action != DEX2OAT_FROM_SCRATCH && !profile_guided) { + if (dexopt_action != DEX2OAT_FROM_SCRATCH) { // Open the possibly existing vdex. If none exist, we pass -1 to dex2oat for input-vdex-fd. const char* path = nullptr; if (is_odex_location) { @@ -1523,8 +1521,8 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins // Open vdex files. Dex2oatFileWrapper in_vdex_fd; Dex2oatFileWrapper out_vdex_fd; - if (!open_vdex_files(dex_path, out_oat_path, dexopt_needed, instruction_set, is_public, - profile_guided, uid, is_secondary_dex, &in_vdex_fd, &out_vdex_fd)) { + if (!open_vdex_files(dex_path, out_oat_path, dexopt_needed, instruction_set, is_public, uid, + is_secondary_dex, &in_vdex_fd, &out_vdex_fd)) { return -1; } |