summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anwar Ghuloum <anwarg@google.com> 2014-03-12 19:57:05 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-12 19:57:05 +0000
commitd105876a6c4f51199b2e24e5aa0384721cd23d0c (patch)
tree051761403b099a454d6569396999a5f9de0fe5da
parent4059bb574ad877c26b41e92d2ddfcb66c5e438ad (diff)
parent85864b8724b3908d2f5aa861276ce5e80d7f820e (diff)
am 85864b87: am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."
* commit '85864b8724b3908d2f5aa861276ce5e80d7f820e': Fix parameter ordering for installd's dex2oat execl.
-rw-r--r--cmds/installd/commands.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 0e3ea4249d..10244ac764 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -632,8 +632,8 @@ 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,
- strlen(dex2oat_flags) > 0 ? dex2oat_flags : NULL,
profile_file,
+ strlen(dex2oat_flags) > 0 ? dex2oat_flags : NULL,
(char*) NULL);
ALOGE("execl(%s) failed: %s\n", DEX2OAT_BIN, strerror(errno));
}