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

Commit 086c3087 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "drm vts: link dynamic libcrypto.so to pass FIPS" am: 5fe9f898 

Change-Id: I73475101a6390a921269b3b68e702aa5c653258d
parents 3c85c155 5fe9f898

drm/1.0/vts/functional/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -43,12 +43,12 @@ cc_library_static { 
        "android.hardware.drm@1.0",

        "android.hardware.drm@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "android.hidl.memory@1.0",

        "libcrypto",

        "libhidlmemory",

        "libhidlmemory",

        "libnativehelper",

        "libnativehelper",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.hardware.drm@1.0-helper",

        "android.hardware.drm@1.0-helper",

        "libcrypto_static",

        "libdrmvtshelper",

        "libdrmvtshelper",

    ],

    ],

    export_shared_lib_headers: [

    export_shared_lib_headers: [
@@ -76,12 +76,12 @@ cc_test { 
        "android.hardware.drm@1.0",

        "android.hardware.drm@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "android.hidl.memory@1.0",

        "libcrypto",

        "libhidlmemory",

        "libhidlmemory",

        "libnativehelper",

        "libnativehelper",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.hardware.drm@1.0-helper",

        "android.hardware.drm@1.0-helper",

        "libcrypto_static",

        "libdrmvtshelper",

        "libdrmvtshelper",

    ],

    ],

    arch: {

    arch: {

drm/1.2/vts/functional/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,12 +31,12 @@ cc_library_static { 
        "android.hardware.drm@1.2",

        "android.hardware.drm@1.2",

        "android.hidl.allocator@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "android.hidl.memory@1.0",

        "libcrypto",

        "libhidlmemory",

        "libhidlmemory",

        "libnativehelper",

        "libnativehelper",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.hardware.drm@1.0-helper",

        "android.hardware.drm@1.0-helper",

        "libcrypto_static",

        "libdrmvtshelper",

        "libdrmvtshelper",

    ],

    ],

    export_shared_lib_headers: [

    export_shared_lib_headers: [
@@ -63,11 +63,11 @@ cc_test { 
        "android.hardware.drm@1.0",

        "android.hardware.drm@1.0",

        "android.hardware.drm@1.2",

        "android.hardware.drm@1.2",

        "android.hidl.allocator@1.0",

        "android.hidl.allocator@1.0",

        "libcrypto",

        "libhidlmemory",

        "libhidlmemory",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.hardware.drm@1.0-helper",

        "android.hardware.drm@1.0-helper",

        "libcrypto_static",

        "libdrmvtshelper",

        "libdrmvtshelper",

    ],

    ],

    arch: {

    arch: {