diff options
Diffstat (limited to 'crypto/cryptsettings')
| -rw-r--r-- | crypto/cryptsettings/Android.mk | 5 | ||||
| -rw-r--r-- | crypto/cryptsettings/cryptsettings.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/crypto/cryptsettings/Android.mk b/crypto/cryptsettings/Android.mk index 73b6b4a8b..3a5704891 100644 --- a/crypto/cryptsettings/Android.mk +++ b/crypto/cryptsettings/Android.mk @@ -7,8 +7,11 @@ 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) -endif
\ No newline at end of file +endif diff --git a/crypto/cryptsettings/cryptsettings.c b/crypto/cryptsettings/cryptsettings.c index 79fad7198..4fa2b9354 100644 --- a/crypto/cryptsettings/cryptsettings.c +++ b/crypto/cryptsettings/cryptsettings.c @@ -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; } |