commit 40bed2434ea821be17917bd212a888112eaae1d0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 03 20:14:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 03 20:14:28 2018 +0000
tree a4f935c6d62115322e82961e7e3288d6693083f0
parent d7610004693c726fa745d350ce0dab023109c6fe
parent f65610d750b30d54b4f897e3dbd748a14cf794be

Merge "Accept DexMetadata files (.dm) for install-multiple"

adb/client/commandline.cpp

diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index 3fb14f3..da273fd 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -1925,7 +1925,8 @@
     for (int i = argc - 1; i >= 0; i--) {
         const char* file = argv[i];
 
-        if (android::base::EndsWithIgnoreCase(file, ".apk")) {
+        if (android::base::EndsWithIgnoreCase(file, ".apk") ||
+            android::base::EndsWithIgnoreCase(file, ".dm")) {
             struct stat sb;
             if (stat(file, &sb) != -1) total_size += sb.st_size;
             first_apk = i;
@@ -1986,9 +1987,8 @@
         }
 
         std::string cmd = android::base::StringPrintf(
-                "%s install-write -S %" PRIu64 " %d %d_%s -",
-                install_cmd.c_str(), static_cast<uint64_t>(sb.st_size), session_id, i,
-                android::base::Basename(file).c_str());
+            "%s install-write -S %" PRIu64 " %d %s -", install_cmd.c_str(),
+            static_cast<uint64_t>(sb.st_size), session_id, android::base::Basename(file).c_str());
 
         int localFd = adb_open(file, O_RDONLY);
         if (localFd < 0) {