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

Commit 7676814f authored by Mattias Nissler's avatar Mattias Nissler Committed by Steve Kondik
Browse files

Convert recovery to use BoringSSL instead of mincrypt. 

This changes the verification code in bootable/recovery to use
BoringSSL instead of mincrypt.

Change-Id: I37b37d84b22e81c32ac180cd1240c02150ddf3a7
parent 56c12f75

Android.mk

+5 −4
Original line number Diff line number Diff line
@@ -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 \
@@ -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
@@ -234,6 +234,7 @@ LOCAL_STATIC_LIBRARIES += \ 
    libminui \

    libfs_mgr \

    libtar \

    libcrypto_utils_static \

    libcrypto_static \

    libselinux \

    libutils \
@@ -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 \

tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libmtdutils \

    libbase \

    libverifier \

    libcrypto_utils_static \

    libcrypto_static \

    libminui \

    libminzip \

updater/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -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