commit a99ad90b5aeebda03948e777159865c1396bead6
author Josh Gao <jmgao@google.com> Sat Feb 20 01:41:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 20 01:41:09 2016 +0000
tree 7c90a8e0c25317ea1c072b558b89ba9e4c452d36
parent f5c7322478702804e47a205a73b03fb6c568f9da
parent 511763b20f63a15cc4f2bfd98423b0447c5da6ef

Merge changes I6541bb13,I486055bb,Id6ac1c54,I16cf7d44

* changes:
  adb: make fdevent_test, socket_test compile on Windows.
  adb: add fd exhaustion test, fix errno reporting in sysdeps_win32.
  adb: move win32 fd base to 2048, fix fd allocation.
  adb: don't emulate fdevent or socketpair on Windows.

.clang-format

diff --git a/.clang-format b/.clang-format
index 6737535..fc4eb1b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,6 +2,7 @@
 AllowShortBlocksOnASingleLine: false
 AllowShortFunctionsOnASingleLine: false
 
+AccessModifierOffset: -2
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false

Android.mk

diff --git a/Android.mk b/Android.mk
index 5b1e3bb..e0997ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -151,7 +151,7 @@
 
 LOCAL_SANITIZE := $(adb_target_sanitize)
 LOCAL_STATIC_LIBRARIES := libadbd
-LOCAL_SHARED_LIBRARIES := libbase libcutils
+LOCAL_SHARED_LIBRARIES := liblog libbase libcutils
 include $(BUILD_NATIVE_TEST)
 
 # libdiagnose_usb