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

Commit 6dc6157b authored by Dario Freni's avatar Dario Freni
Browse files

Support splitAPK in install-multi-package. 

Fix: 125342787
Test: adb install-multi-package file1.apex
base.apk:split1.apk:split2.apk (and also the non-split version)

Change-Id: I3d5ee2504b6d1e4f7ae555586960b61a2e1e9680
parent ef3429da

adb/client/adb_install.cpp

+32 −27
Original line number Diff line number Diff line
@@ -638,20 +638,24 @@ int install_multi_package(int argc, const char** argv) { 
        fprintf(stdout, "Created child session ID %d.\n", session_id);

        session_ids.push_back(session_id);



        // Support splitAPKs by allowing the notation split1.apk:split2.apk:split3.apk as argument.

        std::vector<std::string> splits = android::base::Split(file, ":");



        for (const std::string& split : splits) {

            struct stat sb;

        if (stat(file, &sb) == -1) {

            fprintf(stderr, "adb: failed to stat %s: %s\n", file, strerror(errno));

            if (stat(split.c_str(), &sb) == -1) {

                fprintf(stderr, "adb: failed to stat %s: %s\n", split.c_str(), strerror(errno));

                goto finalize_multi_package_session;

            }



        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());

            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(split).c_str());



        unique_fd local_fd(adb_open(file, O_RDONLY | O_CLOEXEC));

            unique_fd local_fd(adb_open(split.c_str(), O_RDONLY | O_CLOEXEC));

            if (local_fd < 0) {

            fprintf(stderr, "adb: failed to open %s: %s\n", file, strerror(errno));

                fprintf(stderr, "adb: failed to open %s: %s\n", split.c_str(), strerror(errno));

                goto finalize_multi_package_session;

            }
@@ -666,11 +670,11 @@ int install_multi_package(int argc, const char** argv) { 
            read_status_line(remote_fd.get(), buf, sizeof(buf));



            if (strncmp("Success", buf, 7)) {

            fprintf(stderr, "adb: failed to write %s\n", file);

                fprintf(stderr, "adb: failed to write %s\n", split.c_str());

                fputs(buf, stderr);

                goto finalize_multi_package_session;

            }



        }

        all_session_ids += android::base::StringPrintf(" %d", session_id);

    }
@@ -718,6 +722,7 @@ finalize_multi_package_session: 
        fputs(buf, stderr);

    }



    session_ids.push_back(parent_session_id);

    // try to abandon all remaining sessions

    for (std::size_t i = 0; i < session_ids.size(); i++) {

        service = android::base::StringPrintf("%s install-abandon %d", install_cmd.c_str(),