commit 4c9fe596880e86d3e108716156d7cf9d55a5075b
author David Brazdil <dbrazdil@google.com> Wed Feb 20 07:39:08 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 07:39:08 2019 -0800
tree b93db43880fdb507b6647ddd07bd513bbaad994b
parent 7aa65ecdbc148d11e93b7266f8f7633f6dc5948a
parent 459934e5cf48634f2398bf385b2f5153b5e327ca

Merge "Revert^2: dexopt: Fix target-sdk-version argument creation" am: e9d502a4d0
am: 459934e5cf

Change-Id: I7e76fe2fc69c3cafc2dde5a5b81000ff61772bcb

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");
         }