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 --- openaes/Android.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'openaes/Android.mk') diff --git a/openaes/Android.mk b/openaes/Android.mk index 360cf6ccc..336ebddeb 100644 --- a/openaes/Android.mk +++ b/openaes/Android.mk @@ -5,8 +5,8 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) # Build shared binary LOCAL_SRC_FILES:= src/oaes.c \ LOCAL_C_INCLUDES := \ - bootable/recovery/openaes/src/isaac \ - bootable/recovery/openaes/inc + $(commands_recovery_local_path)/openaes/src/isaac \ + $(commands_recovery_local_path)/openaes/inc LOCAL_CFLAGS:= -g -c -W LOCAL_MODULE:=openaes LOCAL_MODULE_TAGS:= eng @@ -20,8 +20,8 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) LOCAL_MODULE := libopenaes LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES := \ - bootable/recovery/openaes/src/isaac \ - bootable/recovery/openaes/inc + $(commands_recovery_local_path)/openaes/src/isaac \ + $(commands_recovery_local_path)/openaes/inc LOCAL_SRC_FILES = src/oaes_lib.c src/isaac/rand.c LOCAL_SHARED_LIBRARIES = libc include $(BUILD_SHARED_LIBRARY) @@ -31,8 +31,8 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) LOCAL_MODULE := libopenaes_static LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES := \ - bootable/recovery/openaes/src/isaac \ - bootable/recovery/openaes/inc + $(commands_recovery_local_path)/openaes/src/isaac \ + $(commands_recovery_local_path)/openaes/inc LOCAL_SRC_FILES = src/oaes_lib.c src/isaac/rand.c LOCAL_STATIC_LIBRARIES = libc include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3