Merge "adb: don\'t pull symlinks." am: 29843cf141

am: e01de06892

* commit 'e01de068926c15d6c247a51f76218c3bff9cac1a':
  adb: don't pull symlinks.
This commit is contained in:
Josh Gao 2015-11-13 23:31:12 +00:00 committed by android-build-merger
commit b5706b5f08

View file

@ -887,8 +887,7 @@ bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst,
continue;
}
if (S_ISREG(src_mode) || S_ISLNK(src_mode)) {
// TODO(b/25601283): symlinks shouldn't be handled as files.
if (S_ISREG(src_mode)) {
std::string path_holder;
if (dst_isdir) {
// If we're copying a remote file to a local directory, we