From 8e27656a9a6dd5b7f04c5ef1b5e776de7e00bccb Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Thu, 4 Oct 2018 10:46:56 -0700 Subject: [PATCH] Restore lost .dm support of adb install-multiple Apparently some changes are lost in https://android-review.googlesource.com/c/platform/system/core/+/600457. Test: adb install-multiple foo.apk foo.dm Bug: 117092647 Change-Id: I87a6e1509de809624254c77073d922617f222ed2 --- adb/client/adb_install.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/adb/client/adb_install.cpp b/adb/client/adb_install.cpp index c00d9555a..4cbc45a42 100644 --- a/adb/client/adb_install.cpp +++ b/adb/client/adb_install.cpp @@ -408,7 +408,8 @@ int install_multiple_app(int argc, const char** argv) { 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; @@ -470,9 +471,9 @@ int install_multiple_app(int argc, const char** argv) { } std::string cmd = - android::base::StringPrintf("%s install-write -S %" PRIu64 " %d %d_%s -", + android::base::StringPrintf("%s install-write -S %" PRIu64 " %d %s -", install_cmd.c_str(), static_cast(sb.st_size), - session_id, i, android::base::Basename(file).c_str()); + session_id, android::base::Basename(file).c_str()); int localFd = adb_open(file, O_RDONLY); if (localFd < 0) {