commit 6af1ac8d1f515e30a088d39d4ea78c8b1e5cfaa0
author Elliott Hughes <enh@google.com> Fri Jul 24 22:02:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 22:02:47 2015 +0000
tree e4b28f91ebf33fd8a7a8aa77ba536488b592ffbc
parent d778fd679f447252a66c5bf161043a1db1faba8e
parent a715b2b6e36d6e0ce27ed5c6cf1f1a0d9d578f30

am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."

* commit '7d86f5e527c01d3fda84575af98888ee117159ee':
  Fix Win32 adb build (for the second time today).

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 4f75b43..355bb7f 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -47,8 +47,12 @@
 LIBADB_CFLAGS := \
     $(ADB_COMMON_CFLAGS) \
     -fvisibility=hidden \
+
+LIBADB_linux_CFLAGS := \
     -std=c++14 \
 
+LIBADB_CFLAGS += $(LIBADB_$(HOST_OS)_CFLAGS)
+
 LIBADB_darwin_SRC_FILES := \
     fdevent.cpp \
     get_my_path_darwin.cpp \