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

Commit 50362509 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Update installd to new compiler filters." am: f4140404 am: d9cfce8e am: 685d2201 

am: 91582cd2

Change-Id: I17208bed9c2cc0ddacc81d093126e679ba0cd178
parents eb51ad33 91582cd2

cmds/installd/dexopt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -321,11 +321,11 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd 


    bool have_dex2oat_compiler_filter_flag;

    if (skip_compilation) {

        strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=verify-none");

        strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=extract");

        have_dex2oat_compiler_filter_flag = true;

        have_dex2oat_relocation_skip_flag = true;

    } else if (vm_safe_mode) {

        strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=interpret-only");

        strcpy(dex2oat_compiler_filter_arg, "--compiler-filter=quicken");

        have_dex2oat_compiler_filter_flag = true;

    } else if (compiler_filter != nullptr &&

            strlen(compiler_filter) + strlen("--compiler-filter=") <