diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-05 19:38:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-05 19:38:45 +0000 |
| commit | e6fff56f2e0867f8797ed3f672f5834aaee7442a (patch) | |
| tree | 4eaf6af86f9633faba1fa4ac12b1ab64c39dbbdd /libcutils | |
| parent | 999bc211ddf5bb9640509dab5731a7e45cb28d5b (diff) | |
| parent | 027e4e77c26652948f43ac07ca8a738c469d39f0 (diff) | |
| download | system_core-e6fff56f2e0867f8797ed3f672f5834aaee7442a.zip system_core-e6fff56f2e0867f8797ed3f672f5834aaee7442a.tar.gz system_core-e6fff56f2e0867f8797ed3f672f5834aaee7442a.tar.bz2 | |
am 027e4e77: am 74088995: am f2c0f328: Merge "libcutils: win_sdk build issues"
* commit '027e4e77c26652948f43ac07ca8a738c469d39f0':
libcutils: win_sdk build issues
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 15 | ||||
| -rw-r--r-- | libcutils/socket_inaddr_any_server.c | 2 | ||||
| -rw-r--r-- | libcutils/socket_loopback_server.c | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 405761c..2dcc965 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -77,7 +77,10 @@ LOCAL_MODULE := libcutils LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_LDLIBS := -lpthread LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CFLAGS += $(hostSmpFlag) -Werror +LOCAL_CFLAGS += $(hostSmpFlag) +ifneq ($(HOST_OS),windows) +LOCAL_CFLAGS += -Werror +endif include $(BUILD_HOST_STATIC_LIBRARY) @@ -88,14 +91,20 @@ LOCAL_MODULE := lib64cutils LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_LDLIBS := -lpthread LOCAL_STATIC_LIBRARIES := lib64log -LOCAL_CFLAGS += $(hostSmpFlag) -m64 -Werror +LOCAL_CFLAGS += $(hostSmpFlag) -m64 +ifneq ($(HOST_OS),windows) +LOCAL_CFLAGS += -Werror +endif include $(BUILD_HOST_STATIC_LIBRARY) # Tests for host # ======================================================== include $(CLEAR_VARS) LOCAL_MODULE := tst_str_parms -LOCAL_CFLAGS += -DTEST_STR_PARMS -Werror +LOCAL_CFLAGS += -DTEST_STR_PARMS +ifneq ($(HOST_OS),windows) +LOCAL_CFLAGS += -Werror +endif LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c LOCAL_STATIC_LIBRARIES := liblog LOCAL_MODULE_TAGS := optional diff --git a/libcutils/socket_inaddr_any_server.c b/libcutils/socket_inaddr_any_server.c index f70d56b..6c849de 100644 --- a/libcutils/socket_inaddr_any_server.c +++ b/libcutils/socket_inaddr_any_server.c @@ -46,7 +46,7 @@ int socket_inaddr_any_server(int port, int type) if(s < 0) return -1; n = 1; - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n)); + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *) &n, sizeof(n)); if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { close(s); diff --git a/libcutils/socket_loopback_server.c b/libcutils/socket_loopback_server.c index 5175e9c..71afce7 100644 --- a/libcutils/socket_loopback_server.c +++ b/libcutils/socket_loopback_server.c @@ -46,7 +46,7 @@ int socket_loopback_server(int port, int type) if(s < 0) return -1; n = 1; - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof(n)); + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *) &n, sizeof(n)); if(bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { close(s); |