commit e0c49e883ea06b1888c5cfd41e14945e80c5059d
author Josh Gao <jmgao@google.com> Fri Nov 13 23:27:41 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 23:27:41 2015 +0000
tree b91d39d3ea906b2ebb5a1dc60f85d2265aafb0c4
parent 2fb63aa909b60575f25479e990433e69eb7bdd83
parent 35ca9029bc07df9a884181ff1e4f6fe703df7e45

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

* commit '29843cf1412e849978daa0aae4bd56e43f141751':
  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