diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-21 22:43:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-21 22:43:56 +0000 |
| commit | fc28ac17a32da390c01a754039c73f4fbcf43f29 (patch) | |
| tree | 637ba3de06ea38866ac24034fc4f186f3929afee /adb/file_sync_service.h | |
| parent | c1557acbd92dc67ef6c64b27d04a50b5aacb2f74 (diff) | |
| parent | 6a2d5a34e81b75ac61337d401aab16bf917b47b1 (diff) | |
am 6a2d5a34: Merge "Fix "adb sync" for devices without vendor and oem."
* commit '6a2d5a34e81b75ac61337d401aab16bf917b47b1':
Fix "adb sync" for devices without vendor and oem.
Diffstat (limited to 'adb/file_sync_service.h')
| -rw-r--r-- | adb/file_sync_service.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/adb/file_sync_service.h b/adb/file_sync_service.h index 6e1ccce44d..344eb985bf 100644 --- a/adb/file_sync_service.h +++ b/adb/file_sync_service.h @@ -17,6 +17,8 @@ #ifndef _FILE_SYNC_SERVICE_H_ #define _FILE_SYNC_SERVICE_H_ +#include <string> + #define htoll(x) (x) #define ltohl(x) (x) @@ -67,7 +69,7 @@ union syncmsg { void file_sync_service(int fd, void *cookie); int do_sync_ls(const char *path); int do_sync_push(const char *lpath, const char *rpath, int show_progress); -int do_sync_sync(const char *lpath, const char *rpath, int listonly); +int do_sync_sync(const std::string& lpath, const std::string& rpath, bool list_only); int do_sync_pull(const char *rpath, const char *lpath, int show_progress, int pullTime); #define SYNC_DATA_MAX (64*1024) |