commit 55c75cad80479f35928f20fba7dcfbc3aec9994e
author Matt Mower <mowerm@gmail.com> Sun Aug 31 11:30:15 2014 -0500
committer Ethan Yonker <dees_troy@teamw.in> Wed Sep 03 10:53:37 2014 -0500
tree c62fafb9c4f2039e253a4c41d783ee89c6e43772
parent 298c4387f7ce8d7488e20792a8e8201a871d4a2b

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

diff --git a/minui/Android.mk b/minui/Android.mk
index e8c1b9c..54eb061 100644
--- a/minui/Android.mk
+++ b/minui/Android.mk
@@ -18,10 +18,10 @@
     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 @@
     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 +=\