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).
2015-07-24 22:04:19 +00:00 · 2015-07-24 22:04:19 +00:00 · 6281dbcd11
commit 6281dbcd11
parent c53ef014e5 7d86f5e527
1 changed files with 4 additions and 0 deletions
--- a/adb/Android.mk
+++ b/adb/Android.mk
@ -47,8 +47,12 @@ LIBADB_TEST_SRCS := \
 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 \