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

* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
  Fix parameter ordering for installd's dex2oat execl.
This commit is contained in:
Anwar Ghuloum 2014-03-11 23:43:19 +00:00 committed by Android Git Automerger
commit 85864b8724

View File

@ -632,8 +632,8 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
execl(DEX2OAT_BIN, DEX2OAT_BIN, execl(DEX2OAT_BIN, DEX2OAT_BIN,
zip_fd_arg, zip_location_arg, zip_fd_arg, zip_location_arg,
oat_fd_arg, oat_location_arg, oat_fd_arg, oat_location_arg,
strlen(dex2oat_flags) > 0 ? dex2oat_flags : NULL,
profile_file, profile_file,
strlen(dex2oat_flags) > 0 ? dex2oat_flags : NULL,
(char*) NULL); (char*) NULL);
ALOGE("execl(%s) failed: %s\n", DEX2OAT_BIN, strerror(errno)); ALOGE("execl(%s) failed: %s\n", DEX2OAT_BIN, strerror(errno));
} }