commit 4c4fa1a57fcf7aaf174655532b19b813a7f43ad3
author Stephen Hines <srhines@google.com> Thu Oct 02 13:38:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 13:38:25 2014 +0000
tree 077f7b7a70ff109a1de7e85721a706e821dffcbd
parent 66f19b01a0e57d46e52019abac445be31cd6c60f
parent 541a780454ca5299a96a5d9bae1fcb650a0c0659

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

* commit '541a780454ca5299a96a5d9bae1fcb650a0c0659':
  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 c458ecb..446ff4d 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -73,7 +73,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