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

Commit cac33ec6 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

Change-Id: I869778acac04ebec02a990617440466fa2463d1e
parents 419f9a37 756b4413
Loading
Loading
Loading
Loading
+3 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,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
    // Disable cdex if update input vdex is true since this combination of options is not
    // supported.
    // 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
    const char* argv[9  // program name, mandatory arguments and the final NULL
                     + (have_dex2oat_isa_variant ? 1 : 0)
                     + (have_dex2oat_isa_variant ? 1 : 0)