commit 541a780454ca5299a96a5d9bae1fcb650a0c0659
author Stephen Hines <srhines@google.com> Thu Oct 02 00:36:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 00:36:09 2014 +0000
tree 43d4e7f44f7c6fb7e322d54becb149e0bd52b724
parent 2ae2dd0db8a7f217b5785e20cefc7c51e0e50b5f
parent 490f03d560e873ad73f964815ca109381efec147

am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.

* commit '490f03d560e873ad73f964815ca109381efec147':
  Fix build breakage for missing -Wcpp option on old GCC versions.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 3643aa5..138e747 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -72,7 +72,10 @@
   LOCAL_SRC_FILES += fdevent.c
 endif
 
-LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Wno-error=cpp -Werror
+LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror
+ifeq ($(HOST_OS),windows)
+LOCAL_CFLAGS += -Wno-error=cpp
+endif
 LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
 LOCAL_MODULE := adb
 LOCAL_MODULE_TAGS := debug