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

Commit 99d7da99 authored by Jeff Hao's avatar Jeff Hao
Browse files

resolve merge conflicts of d3b56698 to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iae7fc90e9281102fb32dcc214838f590b9576f7a
parents b87f3e85 d3b56698

cmds/installd/dexopt.cpp

+3 −3
Original line number Diff line number Diff line
@@ -355,14 +355,14 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd 
        sprintf(profile_arg, "--profile-file-fd=%d", profile_fd);

    }



    // Get the directory of the apk to pass as a base directory.

    char base_dir[arraysize("--base-dir=") + PKG_PATH_MAX];

    // Get the directory of the apk to pass as a base classpath directory.

    char base_dir[arraysize("--classpath-dir=") + PKG_PATH_MAX];

    std::string apk_dir(input_file_name);

    unsigned long dir_index = apk_dir.rfind('/');

    bool has_base_dir = dir_index != std::string::npos;

    if (has_base_dir) {

        apk_dir = apk_dir.substr(0, dir_index);

        sprintf(base_dir, "--base-dir=%s", apk_dir.c_str());

        sprintf(base_dir, "--classpath-dir=%s", apk_dir.c_str());

    }