Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ce8fcf authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[dexopt] Allow secondary dex files to generate app images" am: 6c7d0695 am: 7b9d08a4

Change-Id: I32a8614d9f6c1e0657a9cb3a1b616b2c91e16c7a
parents d0b35ff7 7b9d08a4
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -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.