From a629e2e578acf83dbadd55b70c3221c4289d7031 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 13 Nov 2015 17:55:45 -0800 Subject: [PATCH 1/2] adb: don't link against libcutils on Windows. Bug: http://b/25693157 Change-Id: Ie1f082a094371124b4d66c87c7ab1a0706271b9d --- adb/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adb/Android.mk b/adb/Android.mk index 5ddc93796..c38cf9375 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -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 From bb3f9ce0aaebffd859dcaff07d73523482e5efd2 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 16 Nov 2015 16:17:25 -0800 Subject: [PATCH 2/2] libcutils: don't build for Windows. Change-Id: Ice07f892a346bbba2ed6bfdcddf7222799e76f9d --- libcutils/Android.mk | 56 +++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 3ca544f04..158315020 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -17,27 +17,22 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) commonSources := \ - hashmap.c \ - atomic.c.arm \ - native_handle.c \ - config_utils.c \ - load_file.c \ - strlcpy.c \ - open_memstream.c \ - strdup16to8.c \ - strdup8to16.c \ - record_stream.c \ - process_name.c \ - 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 := \ + hashmap.c \ + atomic.c.arm \ + native_handle.c \ + config_utils.c \ + load_file.c \ + strlcpy.c \ + open_memstream.c \ + strdup16to8.c \ + strdup8to16.c \ + record_stream.c \ + process_name.c \ + threads.c \ + sched_policy.c \ + iosched_policy.c \ + str_parms.c \ + 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 \