commit ee1ab30109c9be1873f81c2e2cee9312f9ca5d87
author Dan Albert <danalbert@google.com> Wed Feb 25 19:18:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 25 19:18:32 2015 +0000
tree 4e33e74bd70dc385da2e16a9614ec6402ebb6132
parent 74abd968584703a71ec03339ade50fa4ae3a2416
parent 956b5ee8d3582467ed9f46267556d97e72b714a6

am a035d500: Merge "Remove _(GNU|XOPEN)_SOURCE makefile cruft."

* commit 'a035d5003ea593322ba565df9a4f4d0dd6647acf':
  Remove _(GNU|XOPEN)_SOURCE makefile cruft.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 94cd88d..86d178a 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -29,7 +29,6 @@
     -Wall -Werror \
     -Wno-unused-parameter \
     -Wno-missing-field-initializers \
-    -D_XOPEN_SOURCE -D_GNU_SOURCE \
     -fvisibility=hidden \
 
 LIBADB_darwin_SRC_FILES := fdevent.cpp get_my_path_darwin.c usb_osx.c
@@ -134,8 +133,12 @@
   LOCAL_SRC_FILES += sysdeps_win32.c
 endif
 
-LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror
-LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
+LOCAL_CFLAGS += \
+    -Wall -Werror \
+    -Wno-unused-parameter \
+    -D_GNU_SOURCE \
+    -DADB_HOST=1 \
+
 LOCAL_MODULE := adb
 LOCAL_MODULE_TAGS := debug
 
@@ -180,7 +183,6 @@
 	-O2 \
 	-g \
 	-DADB_HOST=0 \
-	-D_XOPEN_SOURCE \
 	-D_GNU_SOURCE \
 	-Wall -Wno-unused-parameter -Werror -Wno-deprecated-declarations \