summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-10-02 00:27:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-02 00:27:50 +0000
commit490f03d560e873ad73f964815ca109381efec147 (patch)
tree0c09b6acffb775c74701cf7d546f829dafebce2e
parent4acabfee9e00962be02d06a6771da2e7ade20859 (diff)
parent3ea87c33a1c6e940322f5436cf0dd70a0bdadd75 (diff)
downloadsystem_core-490f03d560e873ad73f964815ca109381efec147.zip
system_core-490f03d560e873ad73f964815ca109381efec147.tar.gz
system_core-490f03d560e873ad73f964815ca109381efec147.tar.bz2
am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
* commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75': Fix build breakage for missing -Wcpp option on old GCC versions.
-rw-r--r--adb/Android.mk5
1 files changed, 4 insertions, 1 deletions
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 @@ else
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