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

Commit 3cd06438 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Installd: Fix bad merge am: f065032f 

am: 7feaca4a

Change-Id: I7bee9623bec05421d5ad161e9d5ecb2d22ed2bf5
parents 50d1339c 7feaca4a

cmds/installd/commands.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1657,11 +1657,6 @@ int dexopt(const char* apk_path, uid_t uid, const char* pkgname, const char* ins 
        } else if (dexopt_needed == DEXOPT_DEX2OAT_NEEDED) {

            // Pass dex2oat the relative path to the input file.

            const char *input_file_name = get_location_from_path(input_file);

            if (input_file_name == NULL) {

                input_file_name = input_file;

            } else {

                input_file_name++;

            }

            run_dex2oat(input_fd.get(),

                        out_fd.get(),

                        image_fd.get(),