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

Commit 43343c69 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Installd: Check for dex2oatd before running it" am: a4d8dae1 am: 7a37fb6d 

am: 745f5951

Change-Id: I6aca90786fd793a1696c87570b3ab813aea8caf4
parents 5d6a8455 745f5951

cmds/installd/dexopt.cpp

+4 −3
Original line number Diff line number Diff line
@@ -308,11 +308,12 @@ 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";

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

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

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

        DCHECK(access(kDex2oatDebugPath, X_OK) == 0);

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

            dex2oat_bin = kDex2oatDebugPath;

        }

    }



    bool generate_minidebug_info = kEnableMinidebugInfo &&

            android::base::GetBoolProperty(kMinidebugInfoSystemProperty,