summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Zimmerman <danzimm@fb.com> 2019-12-20 06:39:33 -0800
committer Mathieu Chartier <mathieuc@google.com> 2020-02-07 18:23:17 +0000
commit84d077cbb2ee11afc8db558b4c7964dc3d4b054f (patch)
treea28652ba62b333f3b4e43232733af205ec4d6fd6
parent26d0eb321c9b9e3eadb9ba0f1d2ebc7c6272e98e (diff)
[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
-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.