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

Commit 6962c456 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use libcrypto_static instead of libcrypto" am: c048c187 am: 06b758a9 am: 978e59e4

am: 135b3a44

Change-Id: I2ae264a5c9998b7c6a2a4bb868e313161f1a3701
parents d45e49b4 135b3a44
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ cc_test {
    static_libs: [
        "android.hardware.confirmationui@1.0",
        "android.hardware.keymaster@4.0",
        "libcrypto",
        "libcrypto_static",
        "libcn-cbor",
        "android.hardware.confirmationui-support-lib",
    ],
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cc_test {
        "libhidlmemory",
        "libnativehelper",
        "libssl",
        "libcrypto",
        "libcrypto_static",
    ],
    test_suites: ["general-tests"],
}
+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ cc_test {
        "libhidlmemory",
        "libnativehelper",
        "libssl",
        "libcrypto",
        "libcrypto_static",
    ],
    test_suites: ["general-tests"],
}
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ cc_test {
    ],
    static_libs: [
        "android.hardware.keymaster@3.0",
        "libcrypto",
        "libcrypto_static",
        "libsoftkeymasterdevice",
    ],
    test_suites: ["general-tests"],
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ cc_test {
    ],
    static_libs: [
        "android.hardware.keymaster@4.0",
        "libcrypto",
        "libcrypto_static",
        "libkeymaster4support",
        "libsoftkeymasterdevice",
    ],