diff options
| author | Stephen Hines <srhines@google.com> | 2014-10-02 13:37:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 13:37:26 +0000 |
| commit | f9d61a007426f47337f9842930b15c2160281c58 (patch) | |
| tree | 144f15de62285d8d41f43615b6984c4f9c7a6000 /adb/Android.mk | |
| parent | 8e0b41de6f5d9ae7f207e347c078f209e828cc60 (diff) | |
| parent | 4acabfee9e00962be02d06a6771da2e7ade20859 (diff) | |
| download | system_core-f9d61a007426f47337f9842930b15c2160281c58.zip system_core-f9d61a007426f47337f9842930b15c2160281c58.tar.gz system_core-f9d61a007426f47337f9842930b15c2160281c58.tar.bz2 | |
am 4acabfee: am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
* commit '4acabfee9e00962be02d06a6771da2e7ade20859':
Remove obsolete reference to ddk; Fixes for -Werror
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 265c8f6..c458ecb 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -40,13 +40,11 @@ ifeq ($(HOST_OS),windows) ifneq ($(strip $(USE_CYGWIN)),) # Pure cygwin case LOCAL_LDLIBS += -lpthread -lgdi32 - LOCAL_C_INCLUDES += /usr/include/w32api/ddk endif ifneq ($(strip $(USE_MINGW)),) # MinGW under Linux case LOCAL_LDLIBS += -lws2_32 -lgdi32 USE_SYSDEPS_WIN32 := 1 - LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk endif LOCAL_C_INCLUDES += development/host/windows/usb/api/ endif @@ -75,7 +73,7 @@ else LOCAL_SRC_FILES += fdevent.c endif -LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror +LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Wno-error=cpp -Werror LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE := adb LOCAL_MODULE_TAGS := debug |