commit 77ca713c29139d53080fbb1e90e14f65482a2ed6
author Josh Gao <jmgao@google.com> Fri Nov 13 23:34:33 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 23:34:33 2015 +0000
tree ecf6170e3bd847f59ef4504c63ace20538ae7542
parent 0471c2b46c9ea0ce0ecefda915b5873fd1e8a800
parent 6eff0f27a4228c974b523cf0f9d5ce164a56239a

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

* commit 'b5706b5f0830fa87244e3bf1685050a9b1da5703':
  adb: don't pull symlinks.

adb/file_sync_client.cpp

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index dcf0b26..a2d2a66 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/file_sync_client.cpp
@@ -887,8 +887,7 @@
             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