diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 12:54:24 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 12:54:24 +0000 |
| commit | 5827cc4bd7b381f2734d0b958f96f4cf81090f42 (patch) | |
| tree | f7676a915b0286b24182622ca26c642e45f48c91 /adb/Android.mk | |
| parent | 39d33d8d54ba55e49f9b430f842647a84751cb85 (diff) | |
| download | system_core-5827cc4bd7b381f2734d0b958f96f4cf81090f42.tar.gz system_core-5827cc4bd7b381f2734d0b958f96f4cf81090f42.tar.bz2 system_core-5827cc4bd7b381f2734d0b958f96f4cf81090f42.zip | |
Revert "libcutils: Fix aliasing violations"
This reverts commit 826d75fb6dcefe8a6c6d4d54a7d215553945812a.
Breaking build with 4.2
bionic/libc/include/string.h:105:33: error: call to '__memcpy_dest_size_error' declared with attribute error: memcpy called with size bigger than destination
bionic/libc/include/string.h:109:32: error: call to '__memcpy_src_size_error' declared with attribute error: memcpy called with size bigger than source
Change-Id: I777e5f5cd87fb972c833ef6bd81b23cd29878e9b
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index b62e856b..0a7591e3 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -74,16 +74,7 @@ else LOCAL_SRC_FILES += fdevent.c endif -LOCAL_CFLAGS += -g -DADB_HOST=1 -Wall -Wno-unused-parameter -# adb can't be built without optimizations, so we enforce -O2 if no -# other optimization flag is set - but we don't override what the global -# flags are saying if something else is given (-Os or -O3 are useful) -ifeq ($(findstring -O, $(HOST_GLOBAL_CFLAGS)),) -LOCAL_CFLAGS += -O2 -endif -ifneq ($(findstring -O0, $(HOST_GLOBAL_CFLAGS)),) -LOCAL_CFLAGS += -O2 -endif +LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE := adb @@ -126,16 +117,7 @@ LOCAL_SRC_FILES := \ log_service.c \ utils.c -LOCAL_CFLAGS := -g -DADB_HOST=0 -Wall -Wno-unused-parameter -# adb can't be built without optimizations, so we enforce -O2 if no -# other optimization flag is set - but we don't override what the global -# flags are saying if something else is given (-Os or -O3 are useful) -ifeq ($(findstring -O, $(TARGET_GLOBAL_CFLAGS)),) -LOCAL_CFLAGS += -O2 -endif -ifneq ($(findstring -O0, $(TARGET_GLOBAL_CFLAGS)),) -LOCAL_CFLAGS += -O2 -endif +LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) @@ -182,6 +164,7 @@ LOCAL_SRC_FILES := \ fdevent.c LOCAL_CFLAGS := \ + -O2 \ -g \ -DADB_HOST=1 \ -DADB_HOST_ON_TARGET=1 \ @@ -190,18 +173,6 @@ LOCAL_CFLAGS := \ -D_XOPEN_SOURCE \ -D_GNU_SOURCE -# adb can't be built without optimizations, so we enforce -O2 if no -# other optimization flag is set - but we don't override what the global -# flags are saying if something else is given (-Os or -O3 are useful) -ifeq ($(findstring -O, $(TARGET_GLOBAL_CFLAGS)),) -LOCAL_CFLAGS += -O2 -endif -ifneq ($(findstring -O0, $(TARGET_GLOBAL_CFLAGS)),) -LOCAL_CFLAGS += -O2 -endif - -LOCAL_C_INCLUDES += external/openssl/include - LOCAL_MODULE := adb LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils |