From ced40108d314de1e5435e8669a2cac4537a54f6c Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Tue, 29 Jan 2019 14:29:37 -0800 Subject: Pick correct DTB for kasan/debug_memory/debug_locking/debug_hang targets Test: make with lunch targets kasan/debug_memory/debug_locking/debug_hang Bug: 111136242 Change-Id: Ia0e2665a47964db7a9e52e987d8fac35f277b665 --- BoardConfig-common.mk | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'BoardConfig-common.mk') diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index b5259f58..afd82597 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -242,10 +242,24 @@ BOARD_VENDOR_KERNEL_MODULES += \ $(wildcard device/google/bonito-kernel/*.ko) endif +# DTB +ifeq (,$(filter-out sargo_kasan bonito_kasan, $(TARGET_PRODUCT))) +BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/kasan +else ifeq (,$(filter-out sargo_kernel_debug_memory bonito_kernel_debug_memory, $(TARGET_PRODUCT))) +BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_memory +else ifeq (,$(filter-out sargo_kernel_debug_locking bonito_kernel_debug_locking, $(TARGET_PRODUCT))) +BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_locking +else ifeq (,$(filter-out sargo_kernel_debug_hang bonito_kernel_debug_hang, $(TARGET_PRODUCT))) +BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_hang +else ifeq (,$(filter-out sargo_kernel_debug_api bonito_kernel_debug_api, $(TARGET_PRODUCT))) +BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel/debug_api +else +BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel +endif + # Testing related defines BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/b4s4-setup.sh # Single vendor RIL with SDM845 BOARD_USES_SDM845_QCRIL := true -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/bonito-kernel -include vendor/google_devices/bonito/proprietary/BoardConfigVendor.mk -- cgit v1.2.3