From ccfb3cfb9cc7656c868b0bd9683fc24ebcbd652e Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 20 Feb 2019 10:39:34 +0000 Subject: Revert^2: dexopt: Fix target-sdk-version argument creation Refactor CL I8fdf96cfe0343042d1a868ca09e6c6b9a629b967 has a typo which leaves the target-sdk-version argument of dex2oat always empty. Fix the issue. This reverts commit 142836515437bec4545d982387895190b8e5c678. Test: manual inspection of command line arguments Test: adb shell pm compile -m speed Change-Id: I6b92e8c595e3c00d71ab13d976ee43f58d1a0013 --- cmds/installd/dexopt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index 3d7feb7bc2..acc06471b5 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -368,7 +368,7 @@ class RunDex2Oat : public ExecVHelper { std::string dex2oat_image_fd; std::string target_sdk_version_arg; if (target_sdk_version != 0) { - StringPrintf("-Xtarget-sdk-version:%d", target_sdk_version); + target_sdk_version_arg = StringPrintf("-Xtarget-sdk-version:%d", target_sdk_version); } std::string class_loader_context_arg; if (class_loader_context != nullptr) { @@ -471,7 +471,7 @@ class RunDex2Oat : public ExecVHelper { if (disable_cdex) { AddArg(kDisableCompactDexFlag); } - AddArg(target_sdk_version_arg); + AddRuntimeArg(target_sdk_version_arg); if (enable_hidden_api_checks) { AddRuntimeArg("-Xhidden-api-checks"); } -- cgit v1.2.3-59-g8ed1b