diff options
| author | Anton Hansson <hansson@google.com> | 2018-08-31 16:10:06 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2018-08-31 16:18:03 +0100 |
| commit | 7f3c01c1d49b59a4fd35c00aee88c3635ba936ec (patch) | |
| tree | d1f18a45ffdade9678f88652315d556da946ef74 | |
| parent | abf8ff7e81f8f45883cc55a7eeff56735c836be4 (diff) | |
| download | system_core-7f3c01c1d49b59a4fd35c00aee88c3635ba936ec.tar.gz system_core-7f3c01c1d49b59a4fd35c00aee88c3635ba936ec.tar.bz2 system_core-7f3c01c1d49b59a4fd35c00aee88c3635ba936ec.zip | |
Make sync and remount support product_services.
Test: adb remount; touch /product_services/x
Test: adb sync
Bug: 80741439
Bug: 113657113
Change-Id: I8d85964428e5c43811bb5e807b523a0175dd3f5b
| -rw-r--r-- | adb/client/commandline.cpp | 5 | ||||
| -rw-r--r-- | adb/daemon/remount_service.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp index b55ae95e2..451422fb0 100644 --- a/adb/client/commandline.cpp +++ b/adb/client/commandline.cpp @@ -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) { diff --git a/adb/daemon/remount_service.cpp b/adb/daemon/remount_service.cpp index ed5f944fd..76500d4c2 100644 --- a/adb/daemon/remount_service.cpp +++ b/adb/daemon/remount_service.cpp @@ -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 { |