ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes Ice07f892,Ie1f082a0 am: 74a33fbcef

Browse source 
am: 053eba0bc1

* commit '053eba0bc1c6cebb5ddb323fae28d0f95cfff4b0':
  libcutils: don't build for Windows.
  adb: don't link against libcutils on Windows.
This commit is contained in:
Josh Gao 2015-11-17 22:32:06 +00:00 • committed by android-build-merger
commit cb601eb981
2 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/Android.mk
View file

@ -261,9 +261,12 @@ LOCAL_STATIC_LIBRARIES := \
libadb \ libadb \
libbase \ libbase \
libcrypto_static \ libcrypto_static \
libcutils \
liblog \ liblog \
# Don't use libcutils on Windows.
LOCAL_STATIC_LIBRARIES_darwin := libcutils
LOCAL_STATIC_LIBRARIES_linux := libcutils
LOCAL_CXX_STL := libc++_static LOCAL_CXX_STL := libc++_static
# Don't add anything here, we don't want additional shared dependencies # Don't add anything here, we don't want additional shared dependencies

56
libcutils/Android.mk
View file

@ -17,27 +17,22 @@ LOCAL_PATH := $(my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
commonSources := \ commonSources := \
hashmap.c \ hashmap.c \
atomic.c.arm \ atomic.c.arm \
native_handle.c \ native_handle.c \
config_utils.c \ config_utils.c \
load_file.c \ load_file.c \
strlcpy.c \ strlcpy.c \
open_memstream.c \ open_memstream.c \
strdup16to8.c \ strdup16to8.c \
strdup8to16.c \ strdup8to16.c \
record_stream.c \ record_stream.c \
process_name.c \ process_name.c \
threads.c \ threads.c \
sched_policy.c \ sched_policy.c \
iosched_policy.c \ iosched_policy.c \
str_parms.c \ str_parms.c \
fs_config.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.c \ fs.c \
multiuser.c \ multiuser.c \
socket_inaddr_any_server.c \ socket_inaddr_any_server.c \
@ -48,7 +43,7 @@ nonWindowsSources := \
socket_network_client.c \ socket_network_client.c \
sockets.c \ sockets.c \
nonWindowsHostSources := \ hostSources := \
ashmem-host.c \ ashmem-host.c \
trace-host.c trace-host.c
@ -56,24 +51,18 @@ nonWindowsHostSources := \
# Shared and static library for host # Shared and static library for host
# ======================================================== # ========================================================
LOCAL_MODULE := libcutils LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(hostSources) dlmalloc_stubs.c
LOCAL_SRC_FILES_darwin := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SRC_FILES_linux := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS_darwin := -Werror -Wall -Wextra LOCAL_CFLAGS := -Werror -Wall -Wextra
LOCAL_CFLAGS_linux := -Werror -Wall -Wextra
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_MODULE_HOST_OS := darwin linux
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libcutils LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) dlmalloc_stubs.c LOCAL_SRC_FILES := $(commonSources) $(hostSources) dlmalloc_stubs.c
LOCAL_SRC_FILES_darwin := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SRC_FILES_linux := $(nonWindowsSources) $(nonWindowsHostSources)
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CFLAGS_darwin := -Werror -Wall -Wextra LOCAL_CFLAGS := -Werror -Wall -Wextra
LOCAL_CFLAGS_linux := -Werror -Wall -Wextra
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)
@ -85,7 +74,6 @@ include $(BUILD_HOST_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libcutils LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) \ LOCAL_SRC_FILES := $(commonSources) \
$(nonWindowsSources) \
android_reboot.c \ android_reboot.c \
ashmem-dev.c \ ashmem-dev.c \
debugger.c \ debugger.c \