tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make sync and remount support product_services."

Browse source
This commit is contained in:
Anton Hansson 2018-09-05 11:00:35 +00:00 committed by Gerrit Code Review
commit 1f8147fb19
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/client/commandline.cpp
View file

@ -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) {

2
adb/daemon/remount_service.cpp
View file

@ -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 {