From 3ea87c33a1c6e940322f5436cf0dd70a0bdadd75 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Wed, 1 Oct 2014 17:16:37 -0700
Subject: Fix build breakage for missing -Wcpp option on old GCC versions.

Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
---
 adb/Android.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'adb')

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
-- 
cgit v1.1