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 --- crypto/fs_mgr/Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crypto/fs_mgr/Android.mk') diff --git a/crypto/fs_mgr/Android.mk b/crypto/fs_mgr/Android.mk index 4196710af..8dd9d4ca2 100644 --- a/crypto/fs_mgr/Android.mk +++ b/crypto/fs_mgr/Android.mk @@ -10,7 +10,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_MODULE:= libfs_mgrtwrp LOCAL_SHARED_LIBRARIES := libext4_utils LOCAL_STATIC_LIBRARIES := liblogwraptwrp libmincrypttwrp -LOCAL_C_INCLUDES += system/extras/ext4_utils bootable/recovery/libmincrypt/includes +LOCAL_C_INCLUDES += \ + system/extras/ext4_utils \ + $(commands_recovery_local_path)/libmincrypt/includes LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3