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

Change-Id: I73475101a6390a921269b3b68e702aa5c653258d
This commit is contained in:
Automerger Merge Worker
2020-03-03 05:47:27 +00:00
2 changed files with 4 additions and 4 deletions

View File

@@ -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: {

View File

@@ -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: {