From 06b91e7965bc3451ecc27886efc3df4c35f197f4 Mon Sep 17 00:00:00 2001 From: OliverG96 Date: Fri, 6 Dec 2013 00:10:56 +0000 Subject: crypto: Fix crypto dependencies for ICS/Samsung methods - libmincrypt renamed to libmincrypttwrp that is an static library - libjpegtwrp does not exist - libfs_mgrtwrp is for JB decryption methods This fixes making full builds when TW_INCLUDE_CRYPTO_SAMSUNG := true and TW_INCLUDE_CRYPTO := true are set. Somehow typing make recoveryimage doesnt push the mentioned issue. Change-Id: I7cad5db4f51152a1a8209e619b188ca88d7c74d1 --- crypto/fs_mgr/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/fs_mgr/Android.mk') diff --git a/crypto/fs_mgr/Android.mk b/crypto/fs_mgr/Android.mk index f638e98c2..4196710af 100644 --- a/crypto/fs_mgr/Android.mk +++ b/crypto/fs_mgr/Android.mk @@ -1,5 +1,5 @@ # Copyright 2011 The Android Open Source Project - +ifeq ($(TW_INCLUDE_JB_CRYPTO), true) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -16,7 +16,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_STATIC_LIBRARY) - include $(CLEAR_VARS) LOCAL_SRC_FILES:= fs_mgr_main.c @@ -34,3 +33,4 @@ LOCAL_STATIC_LIBRARIES := libfs_mgrtwrp liblogwraptwrp libcutils liblog libc lib include $(BUILD_EXECUTABLE) +endif -- cgit v1.2.3