commit 1d84e25648efcda02e53910530f59a3c3351f152
author Mathieu Chartier <mathieuc@google.com> Thu Mar 06 01:05:22 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 06 01:05:22 2014 +0000
tree 56659943c097e3f467ca390674967021a119f71d
parent c9e60374f5144e94103e5b866570be114aa165c8
parent 3c39e03c08094ce65608cae8a45dd726cf10b5c3

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

* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
  Don't pass in empty arg to dex2oat.

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index f8f078c..a167be0 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -623,7 +623,7 @@
     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));
 }