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

Commit 921dfe93 authored by David Sehr's avatar David Sehr Committed by android-build-merger
Browse files

Disable dex2oatd for release background compiles am: 31419e7a 

am: eb9b71e6

Change-Id: I4665d515ea469e45df833a52fb27c3996e990df1
parents 106cd4c2 eb9b71e6

cmds/installd/dexopt.cpp

+3 −1
Original line number Diff line number Diff line
@@ -309,7 +309,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd 
    // If the runtime was requested to use libartd.so, we'll run dex2oatd, otherwise dex2oat.

    const char* dex2oat_bin = "/system/bin/dex2oat";

    constexpr const char* kDex2oatDebugPath = "/system/bin/dex2oatd";

    if (is_debug_runtime() || (background_job_compile && is_debuggable_build())) {

    // Do not use dex2oatd for release candidates (give dex2oat more soak time).

    bool is_release = android::base::GetProperty("ro.build.version.codename", "") == "REL";

    if (is_debug_runtime() || (background_job_compile && is_debuggable_build() && !is_release)) {

        if (access(kDex2oatDebugPath, X_OK) == 0) {

            dex2oat_bin = kDex2oatDebugPath;

        }