commit fab89d2033ff80bf8ef6d2c24d0312571b09d250
author Josh Gao <jmgao@google.com> Fri Nov 13 17:55:45 2015 -0800
committer Josh Gao <jmgao@google.com> Mon Nov 16 16:17:16 2015 -0800
tree 8eebb65cf640859a7e395011482cd327e5f6361e
parent ab35705cf61347372201b90dc5b47cbff16432cc

adb: don't link against libcutils on Windows.

Bug: http://b/25693157
Change-Id: Ie1f082a094371124b4d66c87c7ab1a0706271b9d

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 5ddc937..c38cf93 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -261,9 +261,12 @@
     libadb \
     libbase \
     libcrypto_static \
-    libcutils \
     liblog \
 
+# Don't use libcutils on Windows.
+LOCAL_STATIC_LIBRARIES_darwin := libcutils
+LOCAL_STATIC_LIBRARIES_linux := libcutils
+
 LOCAL_CXX_STL := libc++_static
 
 # Don't add anything here, we don't want additional shared dependencies