commit b29a5e27c33291f8134ea5f28e84e672a3c25199
author D. Andrei Măceș <dmaces@nd.edu> Thu Dec 22 06:19:44 2016 -0500
committer Ethan Yonker <dees_troy@teamw.in> Wed Jan 11 10:56:21 2017 -0600
tree 741757b353cf5a7537fcdf8dcd10d13caca3323b
parent 4767caf1f4cd08cdc7d58476bc017dca17870112

build: Consolidate the crypto_utils presence tests

No point checking filesystem repeatedly/check may change in future

Change-Id: I0413b07b850f785eb5150c6ed18836cc56e94d6f

Android.mk

diff --git a/Android.mk b/Android.mk
index 582b710..9719918 100644
--- a/Android.mk
+++ b/Android.mk
@@ -302,6 +302,8 @@
         LOCAL_SHARED_LIBRARIES += libe4crypt
     endif
 endif
+WITH_CRYPTO_UTILS := \
+    $(if $(wildcard system/core/libcrypto_utils/Android.mk),true)
 ifeq ($(TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID), true)
     LOCAL_CFLAGS += -DTW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID
 endif

minadbd/Android.mk

diff --git a/minadbd/Android.mk b/minadbd/Android.mk
index 3d675dd..24d1635 100644
--- a/minadbd/Android.mk
+++ b/minadbd/Android.mk
@@ -30,7 +30,8 @@
     LOCAL_SHARED_LIBRARIES += libmincrypttwrp
     LOCAL_CFLAGS += -DUSE_MINCRYPT
 else
-    LOCAL_SHARED_LIBRARIES += libcrypto
+    LOCAL_SHARED_LIBRARIES += libcrypto \
+    $(if $(WITH_CRYPTO_UTILS),libcrypto_utils)
 endif
 
 include $(BUILD_SHARED_LIBRARY)

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index b5891ac..3206346 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -96,7 +96,9 @@
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libgccdemangle.so
 endif
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)
-    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so
+
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so \
+    $(if $(WITH_CRYPTO_UTILS),$(TARGET_OUT_SHARED_LIBRARIES)/libcrypto_utils.so)
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpackagelistparser.so
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/liblzma.so
 endif