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

Commit a73a0cbc authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Installd: Rename try_debug_for_background 

Rename to background_job_compile to signal broader future use.

Test: m
Test: manual test - install
Test: adb shell cmd package bg-dexopt-job
Change-Id: I6bdfa2f591733f3340e2a385cb207ab2839772c5
parent d4f0d3a4

cmds/installd/dexopt.cpp

+4 −4
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static const char* get_location_from_path(const char* path) { 
static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vdex_fd, int image_fd,

        const char* input_file_name, const char* output_file_name, int swap_fd,

        const char* instruction_set, const char* compiler_filter,

        bool debuggable, bool post_bootcomplete, bool try_debug_for_background, int profile_fd,

        bool debuggable, bool post_bootcomplete, bool background_job_compile, int profile_fd,

        const char* class_loader_context) {

    static const unsigned int MAX_INSTRUCTION_SET_LEN = 7;
@@ -281,7 +281,7 @@ 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";

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

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

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

        dex2oat_bin = kDex2oatDebugPath;

    }
@@ -1687,7 +1687,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
    bool boot_complete = (dexopt_flags & DEXOPT_BOOTCOMPLETE) != 0;

    bool profile_guided = (dexopt_flags & DEXOPT_PROFILE_GUIDED) != 0;

    bool is_secondary_dex = (dexopt_flags & DEXOPT_SECONDARY_DEX) != 0;

    bool try_debug_for_background = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;

    bool background_job_compile = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;



    // Check if we're dealing with a secondary dex file and if we need to compile it.

    std::string oat_dir_str;
@@ -1783,7 +1783,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
                    compiler_filter,

                    debuggable,

                    boot_complete,

                    try_debug_for_background,

                    background_job_compile,

                    reference_profile_fd.get(),

                    class_loader_context);

        _exit(68);   /* only get here on exec failure */