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

Commit 2a62d427 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Use libcrypto_static instead of libcrypto"

parents 4cbf0954 f117f34a

adb/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ cc_benchmark { 
        "libbase",

        "libcutils",

        "libcrypto_utils",

        "libcrypto",

        "libcrypto_static",

        "libdiagnose_usb",

        "liblog",

        "libusb",
@@ -553,7 +553,7 @@ cc_binary { 
        "libbase",

        "libbootloader_message",

        "libcap",

        "libcrypto",

        "libcrypto_static",

        "libcrypto_utils",

        "libcutils",

        "libdiagnose_usb",
@@ -621,7 +621,7 @@ cc_test { 
        "libbootloader_message",

        "libcutils",

        "libcrypto_utils",

        "libcrypto",

        "libcrypto_static",

        "libdiagnose_usb",

        "liblog",

        "libusb",

fs_mgr/liblp/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
liblp_lib_deps = [

    "libbase",

    "liblog",

    "libcrypto",

    "libcrypto_utils",

    "libsparse",

    "libext4_utils",
@@ -41,7 +40,9 @@ cc_library { 
        "utility.cpp",

        "writer.cpp",

    ],

    shared_libs: liblp_lib_deps,

    shared_libs: [

        "libcrypto",

    ] + liblp_lib_deps,

    target: {

        windows: {

            enabled: true,
@@ -83,6 +84,7 @@ cc_defaults { 
        "libgmock",

        "libfs_mgr",

        "liblp",

        "libcrypto_static",

    ] + liblp_lib_deps,

    header_libs: [

        "libstorage_literals_headers",

fs_mgr/libsnapshot/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ cc_test { 
    ],

    static_libs: [

        "libcutils",

        "libcrypto",

        "libcrypto_static",

        "libfs_mgr",

        "libgmock",

        "liblp",

init/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcutils \

    libbase \

    liblog \

    libcrypto \

    libcrypto_static \

    libdl \

    libz \

    libselinux \
@@ -118,7 +118,6 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_SANITIZE := signed-integer-overflow

# First stage init is weird: it may start without stdout/stderr, and no /proc.

LOCAL_NOSANITIZE := hwaddress

LOCAL_INJECT_BSSL_HASH := true

include $(BUILD_EXECUTABLE)

endif