summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-25 19:09:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-25 19:11:14 +0000
commita035d5003ea593322ba565df9a4f4d0dd6647acf (patch)
treec28ec9bc07e24d93b68d8b0bf72be60409c22ebb /adb
parent948ae1b9353545119a89b6fb8fe8380d4039a366 (diff)
parent7fd821e907c4ee25ea4bdf7643c38bd679efdaca (diff)
downloadsystem_core-a035d5003ea593322ba565df9a4f4d0dd6647acf.zip
system_core-a035d5003ea593322ba565df9a4f4d0dd6647acf.tar.gz
system_core-a035d5003ea593322ba565df9a4f4d0dd6647acf.tar.bz2
Merge "Remove _(GNU|XOPEN)_SOURCE makefile cruft."
Diffstat (limited to 'adb')
-rw-r--r--adb/Android.mk10
1 files changed, 6 insertions, 4 deletions
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 @@ LIBADB_CFLAGS := \
-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 @@ ifneq ($(USE_SYSDEPS_WIN32),)
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 @@ LOCAL_CFLAGS := \
-O2 \
-g \
-DADB_HOST=0 \
- -D_XOPEN_SOURCE \
-D_GNU_SOURCE \
-Wall -Wno-unused-parameter -Werror -Wno-deprecated-declarations \