diff options
Diffstat (limited to 'libcutils/Android.mk')
-rw-r--r-- | libcutils/Android.mk | 73 |
1 files changed, 22 insertions, 51 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index b016a42..9dc15d1 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -16,20 +16,13 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) -ifeq ($(TARGET_CPU_SMP),true) - targetSmpFlag := -DANDROID_SMP=1 -else - targetSmpFlag := -DANDROID_SMP=0 -endif -hostSmpFlag := -DANDROID_SMP=0 - commonSources := \ hashmap.c \ atomic.c.arm \ native_handle.c \ config_utils.c \ - cpu_info.c \ load_file.c \ + strlcpy.c \ open_memstream.c \ strdup16to8.c \ strdup8to16.c \ @@ -39,6 +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 @@ -67,38 +61,33 @@ ifneq ($(WINDOWS_HOST_ONLY),1) sockets.c \ commonHostSources += \ - ashmem-host.c + ashmem-host.c \ + trace-host.c endif -# Static library for host +# Shared and static library for host # ======================================================== LOCAL_MODULE := libcutils LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CFLAGS += $(hostSmpFlag) ifneq ($(HOST_OS),windows) LOCAL_CFLAGS += -Werror endif LOCAL_MULTILIB := both -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_STATIC_LIBRARY) - -# Tests for host -# ======================================================== include $(CLEAR_VARS) -LOCAL_MODULE := tst_str_parms -LOCAL_CFLAGS += -DTEST_STR_PARMS +LOCAL_MODULE := libcutils +LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c +LOCAL_SHARED_LIBRARIES := liblog ifneq ($(HOST_OS),windows) LOCAL_CFLAGS += -Werror endif -LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c -LOCAL_STATIC_LIBRARIES := liblog -LOCAL_MODULE_TAGS := optional -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -include $(BUILD_HOST_EXECUTABLE) +LOCAL_MULTILIB := both +include $(BUILD_HOST_SHARED_LIBRARY) + # Shared and static library for target @@ -111,40 +100,32 @@ LOCAL_SRC_FILES := $(commonSources) \ ashmem-dev.c \ debugger.c \ klog.c \ - memory.c \ partition_utils.c \ properties.c \ qtaguid.c \ - trace.c \ + trace-dev.c \ uevent.c \ -LOCAL_SRC_FILES_arm += \ - arch-arm/memset32.S \ +# arch-arm/memset32.S does not compile with Clang. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as -LOCAL_SRC_FILES_arm64 += \ - arch-arm64/android_memset.S \ +LOCAL_SRC_FILES_arm += arch-arm/memset32.S +LOCAL_SRC_FILES_arm64 += arch-arm64/android_memset.S -LOCAL_SRC_FILES_mips += \ - arch-mips/android_memset.c \ +LOCAL_SRC_FILES_mips += arch-mips/android_memset.c +LOCAL_SRC_FILES_mips64 += arch-mips/android_memset.c LOCAL_SRC_FILES_x86 += \ arch-x86/android_memset16.S \ arch-x86/android_memset32.S \ LOCAL_SRC_FILES_x86_64 += \ - arch-x86_64/android_memset16_SSE2-atom.S \ - arch-x86_64/android_memset32_SSE2-atom.S \ - -LOCAL_CFLAGS_arm += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -LOCAL_CFLAGS_arm64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -LOCAL_CFLAGS_x86 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 + arch-x86_64/android_memset16.S \ + arch-x86_64/android_memset32.S \ LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CFLAGS += $(targetSmpFlag) -Werror -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_CFLAGS += -Werror -std=gnu90 include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -153,18 +134,8 @@ LOCAL_MODULE := libcutils # liblog symbols present in libcutils. LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog LOCAL_SHARED_LIBRARIES := liblog -LOCAL_CFLAGS += $(targetSmpFlag) -Werror +LOCAL_CFLAGS += -Werror LOCAL_C_INCLUDES := $(libcutils_c_includes) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) -LOCAL_MODULE := tst_str_parms -LOCAL_CFLAGS += -DTEST_STR_PARMS -Werror -LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_MODULE_TAGS := optional -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -include $(BUILD_EXECUTABLE) - include $(call all-makefiles-under,$(LOCAL_PATH)) |