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

Commit 1ede70df authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Make sync and remount support product_services." 

am: 1f8147fb

Change-Id: Ib245d9c35a1b207f6ee21d33339c60b11716f4ad
parents 216f77b0 1f8147fb

adb/client/commandline.cpp

+3 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void help() { 
        " pull [-a] REMOTE... LOCAL\n"

        "     copy files/dirs from device\n"

        "     -a: preserve file timestamp and mode\n"

        " sync [all|data|odm|oem|product|system|vendor]\n"

        " sync [all|data|odm|oem|product_services|product|system|vendor]\n"

        "     sync a local build from $ANDROID_PRODUCT_OUT to the device (default all)\n"

        "     -l: list but don't copy\n"

        "\n"
@@ -1713,7 +1713,8 @@ int adb_commandline(int argc, const char** argv) { 
        }



        if (src.empty()) src = "all";

        std::vector<std::string> partitions{"data", "odm", "oem", "product", "system", "vendor"};

        std::vector<std::string> partitions{"data",   "odm",   "oem", "product", "product_services",

                                            "system", "vendor"};

        bool found = false;

        for (const auto& partition : partitions) {

            if (src == "all" || src == partition) {

adb/daemon/remount_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ void remount_service(unique_fd fd, const std::string& cmd) { 
    bool system_verified = !(android::base::GetProperty("partition.system.verified", "").empty());

    bool vendor_verified = !(android::base::GetProperty("partition.vendor.verified", "").empty());



    std::vector<std::string> partitions = {"/odm", "/oem", "/product", "/vendor"};

    std::vector<std::string> partitions{"/odm", "/oem", "/product_services", "/product", "/vendor"};

    if (android::base::GetBoolProperty("ro.build.system_root_image", false)) {

        partitions.push_back("/");

    } else {