summaryrefslogtreecommitdiff
path: root/runtime/oat_file_assistant.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-11-10 10:49:40 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2016-11-10 15:05:18 +0000
commita6a448adb226ed2bc33ba83e1a9ed1ac5c8e990d (patch)
tree440b6e46ba70142a18f4b08d8cf58ea9a68d8d34 /runtime/oat_file_assistant.cc
parente58659aa139a6139f28e5db69391c718234e8cfd (diff)
Revert "Revert "Rename vdex-fd to output-vdex-fd, add input-vdex-fd.""
This reverts commit d4acdd380f79f41959663d2fa442186cb4a185a8. Test: device boots, adb shell cmd package compile works. Test: oat_file_assistant_test bug:30937355 Change-Id: Iad2e66fd7f28ed9c1dc3cab344df7453aab4fa56
Diffstat (limited to 'runtime/oat_file_assistant.cc')
-rw-r--r--runtime/oat_file_assistant.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index ff00451343..0679360a15 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -595,7 +595,7 @@ OatFileAssistant::GenerateOatFile(std::string* error_msg) {
std::vector<std::string> args;
args.push_back("--dex-file=" + dex_location_);
- args.push_back("--vdex-fd=" + std::to_string(vdex_file->Fd()));
+ args.push_back("--output-vdex-fd=" + std::to_string(vdex_file->Fd()));
args.push_back("--oat-fd=" + std::to_string(oat_file->Fd()));
args.push_back("--oat-location=" + oat_file_name);