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

Commit 166e7168 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge changes I36b66fc5,I0561affb 

* changes:
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
parents f091dfe0 1175d0fd

libcutils/Android.mk

+29 −31
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
LOCAL_PATH := $(my-dir)

include $(CLEAR_VARS)



commonSources := \

libcutils_common_sources := \

        hashmap.c \

        atomic.c.arm \

        native_handle.c \
@@ -31,13 +31,12 @@ commonSources := \ 
        threads.c \

        sched_policy.c \

        iosched_policy.c \

	str_parms.c \

        fs_config.c



# some files must not be compiled when building against Mingw

# they correspond to features not used by our host development tools

# which are also hard or even impossible to port to native Win32

nonWindowsSources := \

libcutils_nonwindows_sources := \

        fs.c \

        multiuser.c \

        socket_inaddr_any_server.c \
@@ -47,8 +46,9 @@ nonWindowsSources := \ 
        socket_loopback_server.c \

        socket_network_client.c \

        sockets.c \

        str_parms.c \



nonWindowsHostSources := \

libcutils_nonwindows_host_sources := \

        ashmem-host.c \

        trace-host.c
@@ -56,24 +56,22 @@ nonWindowsHostSources := \ 
# Shared and static library for host

# ========================================================

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) dlmalloc_stubs.c

LOCAL_SRC_FILES_darwin := $(nonWindowsSources) $(nonWindowsHostSources)

LOCAL_SRC_FILES_linux := $(nonWindowsSources) $(nonWindowsHostSources)

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)



include $(CLEAR_VARS)

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) dlmalloc_stubs.c

LOCAL_SRC_FILES_darwin := $(nonWindowsSources) $(nonWindowsHostSources)

LOCAL_SRC_FILES_linux := $(nonWindowsSources) $(nonWindowsHostSources)

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)
@@ -84,8 +82,8 @@ include $(BUILD_HOST_SHARED_LIBRARY) 


include $(CLEAR_VARS)

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) \

        $(nonWindowsSources) \

LOCAL_SRC_FILES := $(libcutils_common_sources) \

        $(libcutils_nonwindows_sources) \

        android_reboot.c \

        ashmem-dev.c \

        debugger.c \