ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Treehugger Robot 2018-08-03 20:14:28 +00:00 • committed by Gerrit Code Review
commit d560f39fd7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/client/commandline.cpp
View file

@ -1925,7 +1925,8 @@ static 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;
@ -1986,9 +1987,8 @@ static int install_multiple_app(int argc, const char** argv) {
}
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) {