From 84d077cbb2ee11afc8db558b4c7964dc3d4b054f Mon Sep 17 00:00:00 2001 From: Dan Zimmerman Date: Fri, 20 Dec 2019 06:39:33 -0800 Subject: [dexopt] Allow secondary dex files to generate app images After creating tests and fixing bugs surrounding loading multiple app images into the runtime we can safely enable generating app image files for secondary dexes. Test: adb shell pm bg-dexopt-job with app installed that uses secondary dexes, verify app image is generated for secondary image. Launch app and verify no class linker/class loader/image space warnings in logcat Bug: 149098478 Change-Id: Iaa04175ee56aae69f41f3e2972c322049cfc9e26 --- cmds/installd/dexopt.cpp | 5 ----- 1 file changed, 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. -- cgit v1.2.3-59-g8ed1b