From 55c75cad80479f35928f20fba7dcfbc3aec9994e Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Sun, 31 Aug 2014 11:30:15 -0500 Subject: Build block TWRP with RECOVERY_VARIANT Enable TWRP to reside alongside other recoveries with the naming convention: bootable/recovery(-flag). If TWRP resides at bootable/recovery and a device does not specify RECOVERY_VARIANT, then it will build like normal. If TWRP resides at bootable/recovery-twrp, then its makefiles will only be parsed if a device specifies 'RECOVERY_VARIANT := twrp'. This prevents TWRP specific makefile warnings/errors (notably, missing DEVICE_RESOLUTION) when another recovery is being built. Change-Id: I8f02fffcd79c309c7123b9428eedc69af02e126e --- mtdutils/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mtdutils') diff --git a/mtdutils/Android.mk b/mtdutils/Android.mk index 6843fa94e..cdde25f31 100644 --- a/mtdutils/Android.mk +++ b/mtdutils/Android.mk @@ -37,7 +37,7 @@ include $(BUILD_SHARED_LIBRARY) ifeq ($(BOARD_USES_BML_OVER_MTD),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := bml_over_mtd.c -LOCAL_C_INCLUDES += bootable/recovery/mtdutils +LOCAL_C_INCLUDES += $(commands_recovery_local_path)/mtdutils LOCAL_MODULE := libbml_over_mtd LOCAL_MODULE_TAGS := eng LOCAL_CFLAGS += -Dmain=bml_over_mtd_main @@ -51,7 +51,7 @@ LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities LOCAL_MODULE_STEM := bml_over_mtd -LOCAL_C_INCLUDES += bootable/recovery/mtdutils +LOCAL_C_INCLUDES += $(commands_recovery_local_path)/mtdutils LOCAL_STATIC_LIBRARIES := libmtdutils LOCAL_SHARED_LIBRARIES := libcutils liblog libc include $(BUILD_EXECUTABLE) -- cgit v1.2.3