summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-07 23:19:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-02-07 23:19:38 +0000
commitc8ccc919d7116c575f14088f0ac25a4228785b51 (patch)
tree37446f4646ac7e4b5118404a420a3bcb3421175d
parent01a43ca0e2c3f9dbfb830bcc3b92012490c787ac (diff)
parentf0ce8fcf3d482e061ff9539b36b5381bf62cabf4 (diff)
Merge "[dexopt] Allow secondary dex files to generate app images" am: 6c7d069509 am: 7b9d08a483 am: f0ce8fcf3d
Change-Id: I22b5071dd8d0ce0573aba6a6b4d9b28b4e8509af
-rw-r--r--cmds/installd/dexopt.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index f95e445ade..e434afdf82 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1271,11 +1271,6 @@ class Dex2oatFileWrapper {
Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path,
bool generate_app_image, bool is_public, int uid, bool is_secondary_dex) {
- // We don't create an image for secondary dex files.
- if (is_secondary_dex) {
- return Dex2oatFileWrapper();
- }
-
const std::string image_path = create_image_filename(out_oat_path);
if (image_path.empty()) {
// Happens when the out_oat_path has an unknown extension.