Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02a7c3a7 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

libcutils: win_sdk build issues 

Change-Id: Ic431166f686aebfd0ee00ad3224b95237ff7a0de
parent 8ec42bb2

libcutils/Android.mk

+12 −3
Original line number Diff line number Diff line
@@ -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

libcutils/socket_inaddr_any_server.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

libcutils/socket_loopback_server.c

+1 −1
Original line number Diff line number Diff line
@@ -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);