Skip to content

Commit

Permalink
Convert recovery to use BoringSSL instead of mincrypt.
Browse files Browse the repository at this point in the history
This changes the verification code in bootable/recovery to use
BoringSSL instead of mincrypt.

Change-Id: I37b37d84b22e81c32ac180cd1240c02150ddf3a7
  • Loading branch information
mnissler authored and Steve Kondik committed Sep 4, 2016
1 parent 56c12f7 commit 7676814
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,13 @@ LOCAL_STATIC_LIBRARIES := \
libdiskconfig \
libsysutils \
libfs_mgr \
libcrypto_utils_static \
libcrypto_static \
libbase \
libutils \
liblog \
liblogwrap \
libselinux \
libcrypto_static \
libscrypt_static \
libnl \
libc++_static \
Expand All @@ -110,8 +111,7 @@ LOCAL_STATIC_LIBRARIES := \
libext2_uuid \
libfec \
libfec_rs \
libsquashfs_utils \
libmincrypt
libsquashfs_utils

LOCAL_HAL_STATIC_LIBRARIES := libhealthd
LOCAL_WHOLE_STATIC_LIBRARIES += libcutils
Expand Down Expand Up @@ -234,6 +234,7 @@ LOCAL_STATIC_LIBRARIES += \
libminui \
libfs_mgr \
libtar \
libcrypto_utils_static \
libcrypto_static \
libselinux \
libutils \
Expand Down Expand Up @@ -334,7 +335,7 @@ LOCAL_SRC_FILES := \
verifier.cpp \
ui.cpp
LOCAL_C_INCLUDES := system/core/fs_mgr/include
LOCAL_STATIC_LIBRARIES := libcrypto_static
LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static
include $(BUILD_STATIC_LIBRARY)

include $(LOCAL_PATH)/minui/Android.mk \
Expand Down
1 change: 1 addition & 0 deletions tests/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ LOCAL_STATIC_LIBRARIES := \
libmtdutils \
libbase \
libverifier \
libcrypto_utils_static \
libcrypto_static \
libminui \
libminzip \
Expand Down
7 changes: 6 additions & 1 deletion updater/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ LOCAL_CLANG := true

LOCAL_SRC_FILES := $(updater_src_files)

LOCAL_STATIC_LIBRARIES += libfec libfec_rs libext4_utils_static libsquashfs_utils libcrypto_static
LOCAL_STATIC_LIBRARIES += libfec \
libfec_rs \
libext4_utils_static \
libsquashfs_utils \
libcrypto_utils_static \
libcrypto_static

LOCAL_CFLAGS += -Wno-unused-parameter
LOCAL_C_INCLUDES += system/extras/ext4_utils
Expand Down

0 comments on commit 7676814

Please sign in to comment.