commit 7d86f5e527c01d3fda84575af98888ee117159ee
author Elliott Hughes <enh@google.com> Fri Jul 24 21:47:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 21:47:49 2015 +0000
tree e5ee5d504361d35c58465e3fc00c14ecd228d46c
parent f077e45cc47d1bf16779f3a689bd0cd857cb7f03
parent 239f6ac8e73e294eaf21ec70a9f2f7a3631ab964

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

* commit '239f6ac8e73e294eaf21ec70a9f2f7a3631ab964':
  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 \