PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add additional build variable checks to Android.mk files

Browse Source 
This was causing the mm command to fail when it was run from
bootable/recovery and no crypto features had been specified in
a device's configuration files

Change-Id: Iddbeea5349bbf75cddb0250cd71821dfe3b7b9d8
This commit is contained in:
Trevor Drake
2013-05-16 01:58:13 +01:00
committed by Dees_Troy
parent 4d4b3361f3
commit 27fab9b26a
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/cryptfs/Android.mk
+2 -1
View File
@@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
ifeq ($(TW_INCLUDE_CRYPTO), true)
LOCAL_SRC_FILES:= \
cryptfs.c
@@ -51,3 +51,4 @@ LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
include $(BUILD_EXECUTABLE)
endif
crypto/cryptsettings/Android.mk
+2 -1
View File
@@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
ifeq ($(TW_INCLUDE_CRYPTO), true)
LOCAL_SRC_FILES:= \
cryptsettings.c
LOCAL_CFLAGS:= -g -c -W
@@ -11,3 +11,4 @@ LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp
LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
include $(BUILD_EXECUTABLE)
endif
crypto/fs_mgr/Android.mk
+2 -1
View File
@@ -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)
@@ -31,3 +31,4 @@ include $(BUILD_STATIC_LIBRARY)
#include $(BUILD_EXECUTABLE)
endif
crypto/ics/Android.mk
+2 -1
View File
@@ -1,5 +1,5 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(TW_INCLUDE_CRYPTO), true)
include $(CLEAR_VARS)
LOCAL_MODULE := libcryptfsics
@@ -23,3 +23,4 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include
LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto
include $(BUILD_SHARED_LIBRARY)
endif
crypto/jb/Android.mk
+3 -2
View File
@@ -1,5 +1,5 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(TW_INCLUDE_JB_CRYPTO), true)
include $(CLEAR_VARS)
LOCAL_MODULE := libcryptfsjb
@@ -11,4 +11,5 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include
LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto
LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_SHARED_LIBRARY)
endif