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

Commit 1175d0fd authored by Josh Gao's avatar Josh Gao
Browse files

libcutils: turn on -Werror on Win32, fix resulting build break. 

Mingw doesn't provide strndup or strtok_r used in str_parms.c, resulting in
-Wimplicit-function-declaration being emitted for the Windows build.
None of the consumers of str_parms.c appear to be compiled for Windows,
so we can just remove it from the Windows build.

Change-Id: I36b66fc54ed261d38f5294bc8662ddb2db4fe64f
parent 9e86f8e0

libcutils/Android.mk

+3 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ libcutils_common_sources := \ 
        threads.c \

        sched_policy.c \

        iosched_policy.c \

        str_parms.c \

        fs_config.c



# some files must not be compiled when building against Mingw
@@ -47,6 +46,7 @@ libcutils_nonwindows_sources := \ 
        socket_loopback_server.c \

        socket_network_client.c \

        sockets.c \

        str_parms.c \



libcutils_nonwindows_host_sources := \

        ashmem-host.c \
@@ -60,8 +60,7 @@ LOCAL_SRC_FILES := $(libcutils_common_sources) dlmalloc_stubs.c 
LOCAL_SRC_FILES_darwin := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)

LOCAL_SRC_FILES_linux := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)

LOCAL_STATIC_LIBRARIES := liblog

LOCAL_CFLAGS_darwin := -Werror -Wall -Wextra

LOCAL_CFLAGS_linux := -Werror -Wall -Wextra

LOCAL_CFLAGS := -Werror -Wall -Wextra

LOCAL_MULTILIB := both

LOCAL_MODULE_HOST_OS := darwin linux windows

include $(BUILD_HOST_STATIC_LIBRARY)
@@ -72,8 +71,7 @@ LOCAL_SRC_FILES := $(libcutils_common_sources) dlmalloc_stubs.c 
LOCAL_SRC_FILES_darwin := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)

LOCAL_SRC_FILES_linux := $(libcutils_nonwindows_sources) $(libcutils_nonwindows_host_sources)

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_CFLAGS_darwin := -Werror -Wall -Wextra

LOCAL_CFLAGS_linux := -Werror -Wall -Wextra

LOCAL_CFLAGS := -Werror -Wall -Wextra

LOCAL_MULTILIB := both

include $(BUILD_HOST_SHARED_LIBRARY)