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

Commit 62d0f901 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Brian Carlstrom
Browse files

Don't pass in empty arg to dex2oat. 

We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.

(cherry picked from commit f53dbfed)

Change-Id: Ia2d60b895391bf83b5d250c20ddb8a4917d347a6
parent cd44310a

cmds/installd/commands.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, 
    execl(DEX2OAT_BIN, DEX2OAT_BIN,

          zip_fd_arg, zip_location_arg,

          oat_fd_arg, oat_location_arg,

          dex2oat_flags,

          strlen(dex2oat_flags) > 0 ? dex2oat_flags : NULL,

          (char*) NULL);

    ALOGE("execl(%s) failed: %s\n", DEX2OAT_BIN, strerror(errno));

}