commit a6dfaf2c6a9de78dba583fc080febe57e47262c4
author Dario Freni <dariofreni@google.com> Wed Jan 30 14:08:35 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 30 14:08:35 2019 -0800
tree c835210c0db4766ed3a368aa5ecb6cb68a10ee06
parent 8b29ef668e3b7a83fd5d1c2c1bf47ef326a8376e
parent fc0a52a6ff2393fa3af864940717894b9d8575e4

Merge "Fix: Propagate cmd args to multi-package sessions." am: 2dc8b4cec8 am: f5a2df770b
am: e03d955c62

Change-Id: I4409db1d4dd0eb6223c00532e0469303a7f6afe4

adb/client/adb_install.cpp

diff --git a/adb/client/adb_install.cpp b/adb/client/adb_install.cpp
index 3869945..2bf2924 100644
--- a/adb/client/adb_install.cpp
+++ b/adb/client/adb_install.cpp
@@ -550,6 +550,10 @@
 
     std::string multi_package_cmd =
             android::base::StringPrintf("%s install-create --multi-package", install_cmd.c_str());
+    for (int i = 1; i < first_package; i++) {
+        multi_package_cmd += " " + escape_arg(argv[i]);
+    }
+
     if (apex_found) {
         multi_package_cmd += " --staged";
     }