commit 85864b8724b3908d2f5aa861276ce5e80d7f820e
author Anwar Ghuloum <anwarg@google.com> Tue Mar 11 23:43:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 23:43:19 2014 +0000
tree fd703c01c0eb38b95a21788af8b2908a9083c3dc
parent d0f7ce457c59d5f50b0fefc0fe768fad564d0c7e
parent 06ed9491418ce84e4272bf4201545fa6cfe3932e

am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."

* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
  Fix parameter ordering for installd's dex2oat execl.

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 0e3ea42..10244ac 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -632,8 +632,8 @@
     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));
 }