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

Commit 74a33fbc authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge changes Ice07f892,Ie1f082a0 

* changes:
  libcutils: don't build for Windows.
  adb: don't link against libcutils on Windows.
parents 0ba26064 bb3f9ce0

adb/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -261,9 +261,12 @@ LOCAL_STATIC_LIBRARIES := \ 
    libadb \

    libbase \

    libcrypto_static \

    libcutils \

    liblog \



# Don't use libcutils on Windows.

LOCAL_STATIC_LIBRARIES_darwin := libcutils

LOCAL_STATIC_LIBRARIES_linux := libcutils



LOCAL_CXX_STL := libc++_static



# Don't add anything here, we don't want additional shared dependencies

libcutils/Android.mk

+22 −34
Original line number Diff line number Diff line
@@ -32,12 +32,7 @@ commonSources := \ 
        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 := \

        fs_config.c \

        fs.c \

        multiuser.c \

        socket_inaddr_any_server.c \
@@ -48,7 +43,7 @@ nonWindowsSources := \ 
        socket_network_client.c \

        sockets.c \



nonWindowsHostSources := \

hostSources := \

        ashmem-host.c \

        trace-host.c
@@ -56,24 +51,18 @@ 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 := $(commonSources) $(hostSources) dlmalloc_stubs.c

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

LOCAL_MODULE_HOST_OS := darwin linux

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 := $(commonSources) $(hostSources) dlmalloc_stubs.c

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)
@@ -85,7 +74,6 @@ include $(BUILD_HOST_SHARED_LIBRARY) 
include $(CLEAR_VARS)

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) \

        $(nonWindowsSources) \

        android_reboot.c \

        ashmem-dev.c \

        debugger.c \