commit e9d502a4d073e6695a1166ddb328ead45757c548
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 20 15:24:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 15:24:32 2019 +0000
tree ad80573b34b23768873a9d3bfbf30f22532e5656
parent b4406da4a5beeec9cbf1f90446e677c657130adf
parent ccfb3cfb9cc7656c868b0bd9683fc24ebcbd652e

Merge "Revert^2: dexopt: Fix target-sdk-version argument creation"

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 3d7feb7..acc0647 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -368,7 +368,7 @@
         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 @@
         if (disable_cdex) {
             AddArg(kDisableCompactDexFlag);
         }
-        AddArg(target_sdk_version_arg);
+        AddRuntimeArg(target_sdk_version_arg);
         if (enable_hidden_api_checks) {
             AddRuntimeArg("-Xhidden-api-checks");
         }