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 --- minui/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'minui') diff --git a/minui/Android.mk b/minui/Android.mk index e8c1b9ccf..54eb06166 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -18,10 +18,10 @@ ifeq ($(TW_TARGET_USES_QCOM_BSP), true) LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include else - LOCAL_C_INCLUDES += bootable/recovery/minui/include + LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minui/include endif else - LOCAL_C_INCLUDES += bootable/recovery/minui/include + LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minui/include endif LOCAL_STATIC_LIBRARY := libpng @@ -73,10 +73,10 @@ ifeq ($(TW_TARGET_USES_QCOM_BSP), true) LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include else - LOCAL_C_INCLUDES += bootable/recovery/minui/include + LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minui/include endif else - LOCAL_C_INCLUDES += bootable/recovery/minui/include + LOCAL_C_INCLUDES += $(commands_recovery_local_path)/minui/include endif LOCAL_C_INCLUDES +=\ -- cgit v1.2.3