summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-10-02 13:53:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-02 13:53:00 +0000
commitf1ee5cd0adad0989f4a8cd0831d2a66d2f617101 (patch)
tree898aa44881f58f5ddc6a22a0f8226b7c06a2d466 /adb
parent217cc74a38ac37c6900caa8ed3430ac57f1251f1 (diff)
parent4c4fa1a57fcf7aaf174655532b19b813a7f43ad3 (diff)
downloadsystem_core-f1ee5cd0adad0989f4a8cd0831d2a66d2f617101.zip
system_core-f1ee5cd0adad0989f4a8cd0831d2a66d2f617101.tar.gz
system_core-f1ee5cd0adad0989f4a8cd0831d2a66d2f617101.tar.bz2
am 4c4fa1a5: am 541a7804: am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
* commit '4c4fa1a57fcf7aaf174655532b19b813a7f43ad3': Fix build breakage for missing -Wcpp option on old GCC versions.
Diffstat (limited to 'adb')
-rw-r--r--adb/Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index c458ecb..446ff4d 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