am 3c39e03c: Merge "Don\'t pass in empty arg to dex2oat."

* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3': Don't pass in empty arg to dex2oat.
2014-03-06 01:05:22 +00:00 · 2014-03-06 01:05:22 +00:00 · 1d84e25648
parent c9e60374f5 3c39e03c08
commit 1d84e25648
1 changed files with 1 additions and 1 deletions
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@ -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));
 }