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

Commit c3f87bc9 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "[dexopt] Allow secondary dex files to generate app...

Merge "Revert "Revert "[dexopt] Allow secondary dex files to generate app images""" into rvc-dev am: 3895bbf1 am: 9c269200 am: 0728c381

Change-Id: I0968d10da21cb6b5864397798881f905015ac7ba
parents f7573955 0728c381
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -1273,11 +1273,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.