commit f746dbb0541e05182450fe64f119e93d656eaac6
author Matt Mower <mowerm@gmail.com> Wed May 13 22:56:31 2015 -0500
committer Dees Troy <dees_troy@teamw.in> Tue May 19 21:08:46 2015 +0200
tree 628709ad2abf52f590654f412d2a9c9202c9123c
parent 56fe5e71e5c52f24118b36d41da0b842cd082be1

Only include uncrypt if not in system/core

Some android trees have uncrypt in system/core (cm-11.0). This breaks
building recovery since two modules of the same name conflict. Only
include the local copy of uncrypt if it doesn't already exist in
system/core.

Change-Id: Ie2d7cdedf0d4c9ad148c43b317d1f22d1e50e1f7

Android.mk

diff --git a/Android.mk b/Android.mk
index 27abb5e..3ff9209 100644
--- a/Android.mk
+++ b/Android.mk
@@ -479,10 +479,13 @@
     $(LOCAL_PATH)/tests/Android.mk \
     $(LOCAL_PATH)/tools/Android.mk \
     $(LOCAL_PATH)/edify/Android.mk \
-    $(LOCAL_PATH)/uncrypt/Android.mk \
     $(LOCAL_PATH)/updater/Android.mk \
     $(LOCAL_PATH)/applypatch/Android.mk
 
+ifeq ($(wildcard system/core/uncrypt/Android.mk),)
+    include $(commands_recovery_local_path)/uncrypt/Android.mk
+endif
+
 #includes for TWRP
 include $(commands_recovery_local_path)/injecttwrp/Android.mk \
     $(commands_recovery_local_path)/htcdumlock/Android.mk \