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

Commit a5de1cfe authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Disable cdex for non background dexopt" am: 4f9ecc63 am: 756b4413

am: cac33ec6

Change-Id: Ida33e9587f00f2a5ec4d0ea38f6bb602b1ebbd1b
parents 7e7cddfa cac33ec6
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -417,7 +417,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd

    // Disable cdex if update input vdex is true since this combination of options is not
    // supported.
    const bool disable_cdex = input_vdex_fd == output_vdex_fd;
    // Disable cdex for non-background compiles since we don't want to regress app install until
    // there are enough benefits to justify the tradeoff.
    const bool disable_cdex = !background_job_compile || (input_vdex_fd == output_vdex_fd);

    const char* argv[9  // program name, mandatory arguments and the final NULL
                     + (have_dex2oat_isa_variant ? 1 : 0)