Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06b91e79 authored by OliverG96's avatar OliverG96 Committed by Dees Troy
Browse files

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
parent 62bd9e04

crypto/cryptfs/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ LOCAL_SHARED_LIBRARIES += libcrypto 
LOCAL_LDFLAGS += -ldl



LOCAL_STATIC_LIBRARIES += libmtdutils

LOCAL_STATIC_LIBRARIES += libminadbd libminzip libunz

LOCAL_STATIC_LIBRARIES += libminuitwrp libpixelflinger_static libpng libjpegtwrp libgui

LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libmincrypt libext4_utils

LOCAL_STATIC_LIBRARIES += libminzip libunz

LOCAL_STATIC_LIBRARIES += libpixelflinger_static libpng libmincrypttwrp

LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libext4_utils

LOCAL_STATIC_LIBRARIES += libcrypt_samsung

crypto/cryptsettings/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ LOCAL_CFLAGS:= -g -c -W 
LOCAL_MODULE:=cryptsettings

LOCAL_MODULE_TAGS:= eng

LOCAL_SHARED_LIBRARIES += libc libcutils

ifeq ($(TW_INCLUDE_JB_CRYPTO), true)

LOCAL_CFLAGS += -DTW_INCLUDE_JB_CRYPTO

LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp

endif

LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES

LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities

include $(BUILD_EXECUTABLE)

crypto/cryptsettings/cryptsettings.c

+4 −0
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 
#include <stdlib.h>

#include <sys/stat.h>

#include <fcntl.h>

#ifdef TW_INCLUDE_JB_CRYPTO

#include "../crypto/fs_mgr/include/fs_mgr.h"

#endif



#include "cutils/properties.h"
@@ -41,11 +43,13 @@ int main(void) 
	printf("TW_CRYPTO_FS_FLAGS := \"%s\"\n", prop);

	property_get("ro.crypto.keyfile.userdata", prop, "footer");

	printf("TW_CRYPTO_KEY_LOC := \"%s\"\n", prop);

#ifdef TW_INCLUDE_JB_CRYPTO

	printf("\n*** NEW FOR JELLY BEAN:\n");

	strcpy(fstab_filename, FSTAB_PREFIX);

	property_get("ro.hardware", fstab_filename + sizeof(FSTAB_PREFIX) - 1, "");

	fs_mgr_get_crypt_info(fstab_filename, key_loc, blk_dev, sizeof(key_loc));

	printf("fstab file location: '%s'\n\nTW_INCLUDE_JB_CRYPTO := true\n", fstab_filename);

#endif



	return 0;

}

crypto/fs_mgr/Android.mk

+2 −2
Original line number Diff line number Diff line 
# 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

minuitwrp/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ LOCAL_C_INCLUDES += \ 
    system/core/include \

    external/jpeg



LOCAL_C_INCLUDES += \

    bootable/recovery/libjpegtwrp



ifeq ($(RECOVERY_TOUCHSCREEN_SWAP_XY), true)

LOCAL_CFLAGS += -DRECOVERY_TOUCHSCREEN_SWAP_XY

endif