summaryrefslogtreecommitdiffstats
path: root/adb/Android.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-10-02 00:31:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-02 00:31:50 +0000
commitd2ee70758627cd67c9e393f6ae7f453093a1c957 (patch)
tree831655eb6ab9eda3f5bd8912f0c254525776c1d1 /adb/Android.mk
parent1e95e0b19cd265088286940def38d27305f847af (diff)
parent3ea87c33a1c6e940322f5436cf0dd70a0bdadd75 (diff)
downloadsystem_core-d2ee70758627cd67c9e393f6ae7f453093a1c957.tar.gz
system_core-d2ee70758627cd67c9e393f6ae7f453093a1c957.tar.bz2
system_core-d2ee70758627cd67c9e393f6ae7f453093a1c957.zip
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.
Diffstat (limited to 'adb/Android.mk')
-rw-r--r--adb/Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index c458ecbde..446ff4dc3 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -73,7 +73,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