diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-06 01:01:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-06 01:01:08 +0000 |
| commit | 3c39e03c08094ce65608cae8a45dd726cf10b5c3 (patch) | |
| tree | 8b7eda08854f5c69f5bfcf3cc8c9f07ba9e27064 | |
| parent | e19c99aad605c395f53bf39ae1a27e298e7e33ce (diff) | |
| parent | f53dbfeda39c290ed67b0682d559a80cb42ceb79 (diff) | |
| download | native-3c39e03c08094ce65608cae8a45dd726cf10b5c3.tar.gz | |
Merge "Don't pass in empty arg to dex2oat."
| -rw-r--r-- | cmds/installd/commands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index f8f078c771..a167be06c3 100644 --- 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)); } |