diff options
| author | Colin Cross <ccross@android.com> | 2014-02-13 20:24:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-13 20:24:47 +0000 |
| commit | a6b770566e62196f2fff8ab25952c33deed90ea8 (patch) | |
| tree | 12a8500cd1d019f87027c428ad615a12277fee66 /debuggerd/Android.mk | |
| parent | 2e7347d617b02b13d227bb4cecf6bd69b7b20fa9 (diff) | |
| parent | 579c9bc8a48a34b4fc5065a49febf7f80b2dd4c4 (diff) | |
| download | system_core-a6b770566e62196f2fff8ab25952c33deed90ea8.zip system_core-a6b770566e62196f2fff8ab25952c33deed90ea8.tar.gz system_core-a6b770566e62196f2fff8ab25952c33deed90ea8.tar.bz2 | |
Merge "build debuggerd and debuggerd64 on 64-bit architectures"
Diffstat (limited to 'debuggerd/Android.mk')
| -rw-r--r-- | debuggerd/Android.mk | 64 |
1 files changed, 14 insertions, 50 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk index e0a2d96..77fcbe0 100644 --- a/debuggerd/Android.mk +++ b/debuggerd/Android.mk @@ -1,71 +1,35 @@ -# Copyright 2005 The Android Open Source Project - LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - backtrace.cpp \ - debuggerd.cpp \ - getevent.cpp \ - tombstone.cpp \ - utility.cpp \ - $(TARGET_ARCH)/machine.cpp \ -LOCAL_CONLYFLAGS := -std=gnu99 -LOCAL_CPPFLAGS := -std=gnu++11 -LOCAL_CFLAGS := \ - -Wall \ - -Wno-array-bounds \ - -Werror \ - -Wno-unused-parameter \ +debuggerd_2nd_arch_var_prefix := +include $(LOCAL_PATH)/debuggerd.mk -ifeq ($(TARGET_IS_64_BIT),true) - LOCAL_MODULE := debuggerd64 -else - LOCAL_MODULE := debuggerd +ifdef TARGET_2ND_ARCH +debuggerd_2nd_arch_var_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) +include $(LOCAL_PATH)/debuggerd.mk endif ifeq ($(ARCH_ARM_HAVE_VFP),true) +include $(CLEAR_VARS) + LOCAL_CFLAGS += -DWITH_VFP -endif # ARCH_ARM_HAVE_VFP ifeq ($(ARCH_ARM_HAVE_VFP_D32),true) LOCAL_CFLAGS += -DWITH_VFP_D32 endif # ARCH_ARM_HAVE_VFP_D32 -LOCAL_SHARED_LIBRARIES := \ - libbacktrace \ - libc \ - libcutils \ - liblog \ - libselinux \ - -include external/stlport/libstlport.mk - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := crasher.c -LOCAL_SRC_FILES += $(TARGET_ARCH)/crashglue.S -LOCAL_MODULE := crasher +LOCAL_SRC_FILES := vfp-crasher.c arm/vfp.S +LOCAL_MODULE := vfp-crasher LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -fstack-protector-all -Wno-unused-parameter -Wno-free-nonheap-object -#LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_SHARED_LIBRARIES := libcutils liblog libc +LOCAL_MODULE_TARGET_ARCH := arm include $(BUILD_EXECUTABLE) +endif # ARCH_ARM_HAVE_VFP == true -ifeq ($(ARCH_ARM_HAVE_VFP),true) include $(CLEAR_VARS) - -LOCAL_CFLAGS += -DWITH_VFP -ifeq ($(ARCH_ARM_HAVE_VFP_D32),true) -LOCAL_CFLAGS += -DWITH_VFP_D32 -endif # ARCH_ARM_HAVE_VFP_D32 - -LOCAL_SRC_FILES := vfp-crasher.c $(TARGET_ARCH)/vfp.S -LOCAL_MODULE := vfp-crasher +LOCAL_SRC_FILES := vfp-crasher.c arm64/vfp.S +LOCAL_MODULE := vfp-crasher64 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libcutils liblog libc +LOCAL_MODULE_TARGET_ARCH := arm64 include $(BUILD_EXECUTABLE) -endif # ARCH_ARM_HAVE_VFP == true |