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

Commit 87a6b1d7 authored by Colin Cross's avatar Colin Cross
Browse files

debuggerd: use LOCAL_MULTILIB 

Use LOCAL_MULTILIB to build multiple versions of executables
instead of manually creating two build rules.

Change-Id: I1a993ff7b5f527a88735f46eec9822bb97d16490
parent 6940bc08

debuggerd/Android.mk

+75 −17
Original line number Original line Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)





debuggerd_2nd_arch_var_prefix :=

include $(CLEAR_VARS)

include $(LOCAL_PATH)/debuggerd.mk





ifdef TARGET_2ND_ARCH

LOCAL_SRC_FILES:= \

debuggerd_2nd_arch_var_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)

	backtrace.cpp \

include $(LOCAL_PATH)/debuggerd.mk

	debuggerd.cpp \

endif

	getevent.cpp \

	tombstone.cpp \

	utility.cpp \





ifeq ($(ARCH_ARM_HAVE_VFP),true)

LOCAL_SRC_FILES_arm    := arm/machine.cpp

include $(CLEAR_VARS)

LOCAL_SRC_FILES_arm64  := arm64/machine.cpp

LOCAL_SRC_FILES_mips   := mips/machine.cpp

LOCAL_SRC_FILES_x86    := x86/machine.cpp

LOCAL_SRC_FILES_x86_64 := x86_64/machine.cpp



LOCAL_CONLYFLAGS := -std=gnu99

LOCAL_CPPFLAGS := -std=gnu++11

LOCAL_CFLAGS := \

	-Wall \

	-Wno-array-bounds \

	-Werror \

	-Wno-unused-parameter \





LOCAL_CFLAGS += -DWITH_VFP

ifeq ($(ARCH_ARM_HAVE_VFP),true)

LOCAL_CFLAGS_arm += -DWITH_VFP

endif # ARCH_ARM_HAVE_VFP

ifeq ($(ARCH_ARM_HAVE_VFP_D32),true)

ifeq ($(ARCH_ARM_HAVE_VFP_D32),true)

LOCAL_CFLAGS += -DWITH_VFP_D32

LOCAL_CFLAGS_arm += -DWITH_VFP_D32

endif # ARCH_ARM_HAVE_VFP_D32

endif # ARCH_ARM_HAVE_VFP_D32





LOCAL_SRC_FILES := vfp-crasher.c arm/vfp.S

LOCAL_SHARED_LIBRARIES := \

LOCAL_MODULE := vfp-crasher

	libbacktrace \

	libc \

	libcutils \

	liblog \

	libselinux \



include external/stlport/libstlport.mk



LOCAL_MODULE := debuggerd

LOCAL_MODULE_STEM_32 := debuggerd

LOCAL_MODULE_STEM_64 := debuggerd64

LOCAL_MULTILIB := both



include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := crasher.c

LOCAL_SRC_FILES_arm    := arm/crashglue.S

LOCAL_SRC_FILES_arm64  := arm64/crashglue.S

LOCAL_SRC_FILES_mips   := mips/crashglue.S

LOCAL_SRC_FILES_x86    := x86/crashglue.S

LOCAL_SRC_FILES_x86_64 := x86_64/crashglue.S

LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)

LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)

LOCAL_MODULE_TAGS := optional

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_SHARED_LIBRARIES := libcutils liblog libc

LOCAL_MODULE_TARGET_ARCH := arm



LOCAL_MODULE := crasher

LOCAL_MODULE_STEM_32 := crasher

LOCAL_MODULE_STEM_64 := crasher64

LOCAL_MULTILIB := both



include $(BUILD_EXECUTABLE)

include $(BUILD_EXECUTABLE)

endif # ARCH_ARM_HAVE_VFP == true





include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := vfp-crasher.c arm64/vfp.S



LOCAL_MODULE := vfp-crasher64

ifeq ($(ARCH_ARM_HAVE_VFP),true)

LOCAL_MODULE_TARGET_ARCH += arm

LOCAL_SRC_FILES_arm := arm/vfp.S

LOCAL_CFLAGS_arm += -DWITH_VFP

ifeq ($(ARCH_ARM_HAVE_VFP_D32),true)

LOCAL_CFLAGS_arm += -DWITH_VFP_D32

endif # ARCH_ARM_HAVE_VFP_D32

endif # ARCH_ARM_HAVE_VFP == true



LOCAL_SRC_FILES_arm64 := arm64/vfp.S

LOCAL_MODULE_TARGET_ARCH += arm64



LOCAL_SRC_FILES := vfp-crasher.c

LOCAL_MODULE := vfp-crasher

LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)

LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := libcutils liblog libc

LOCAL_SHARED_LIBRARIES := libcutils liblog libc

LOCAL_MODULE_TARGET_ARCH := arm64



LOCAL_MODULE_STEM_32 := vfp-crasher

LOCAL_MODULE_STEM_64 := vfp-crasher64

LOCAL_MULTILIB := both



include $(BUILD_EXECUTABLE)
 
include $(BUILD_EXECUTABLE)

debuggerd/debuggerd.mk

deleted100644 → 0
+0 −75
Original line number Original line Diff line number Diff line 
# 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 \



LOCAL_SRC_FILES_arm    := arm/machine.cpp

LOCAL_SRC_FILES_arm64  := arm64/machine.cpp

LOCAL_SRC_FILES_mips   := mips/machine.cpp

LOCAL_SRC_FILES_x86    := x86/machine.cpp

LOCAL_SRC_FILES_x86_64 := x86_64/machine.cpp



LOCAL_CONLYFLAGS := -std=gnu99

LOCAL_CPPFLAGS := -std=gnu++11

LOCAL_CFLAGS := \

	-Wall \

	-Wno-array-bounds \

	-Werror \

	-Wno-unused-parameter \



ifeq ($(ARCH_ARM_HAVE_VFP),true)

LOCAL_CFLAGS_arm += -DWITH_VFP

endif # ARCH_ARM_HAVE_VFP

ifeq ($(ARCH_ARM_HAVE_VFP_D32),true)

LOCAL_CFLAGS_arm += -DWITH_VFP_D32

endif # ARCH_ARM_HAVE_VFP_D32



LOCAL_SHARED_LIBRARIES := \

	libbacktrace \

	libc \

	libcutils \

	liblog \

	libselinux \



include external/stlport/libstlport.mk



ifeq ($(TARGET_IS_64_BIT)|$(debuggerd_2nd_arch_var_prefix),true|)

LOCAL_MODULE := debuggerd64

LOCAL_NO_2ND_ARCH := true

else

LOCAL_MODULE := debuggerd

LOCAL_32_BIT_ONLY := true

endif



include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := crasher.c

LOCAL_SRC_FILES_arm    := arm/crashglue.S

LOCAL_SRC_FILES_arm64  := arm64/crashglue.S

LOCAL_SRC_FILES_mips   := mips/crashglue.S

LOCAL_SRC_FILES_x86    := x86/crashglue.S

LOCAL_SRC_FILES_x86_64 := x86_64/crashglue.S

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_2ND_ARCH_VAR_PREFIX := $(debuggerd_2nd_arch_var_prefix)



ifeq ($(TARGET_IS_64_BIT)|$(debuggerd_2nd_arch_var_prefix),true|)

LOCAL_MODULE := crasher64

LOCAL_NO_2ND_ARCH := true

else

LOCAL_MODULE := crasher

LOCAL_32_BIT_ONLY := true

endif

include $(BUILD_EXECUTABLE)