diff options
| author | 2020-02-09 23:12:54 +0000 | |
|---|---|---|
| committer | 2020-02-09 23:12:54 +0000 | |
| commit | 6f9e12ea9dfcb280dd65c74d2f9e084c71b648bc (patch) | |
| tree | 88679909d88f1e3ee5a340b98cdcc67cd839368b | |
| parent | 7340afce22fd873890f9511834b5f03029bc9c7f (diff) | |
| parent | 0901c517a542dbb9f8714d8065fc6c859cf2687d (diff) | |
Merge "Revert "[dexopt] Allow secondary dex files to generate app images"" am: 799cfc57c3 am: a0a62037e1 am: 0901c517a5
Change-Id: Id7d031219c051f2986fce73594e827f884f3326b
| -rw-r--r-- | cmds/installd/dexopt.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index e434afdf82..f95e445ade 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -1271,6 +1271,11 @@ 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. |