Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e9b35a authored by Victor Hsieh's avatar Victor Hsieh Committed by android-build-merger
Browse files

Merge "Restore lost .dm support of adb install-multiple" am: 29553d2d 

am: adeed270

Change-Id: I0fd9269f5c9631fc3b72f3b12d2a2eaa681d4777
parents 25512107 adeed270

adb/client/adb_install.cpp

+4 −3
Original line number Diff line number Diff line
@@ -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<uint64_t>(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) {