Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev

This commit is contained in:
Robert Shih
2020-03-06 19:35:33 +00:00
committed by Android (Google) Code Review

View File

@@ -30,12 +30,12 @@ cc_library_static {
"android.hardware.drm@1.3", "android.hardware.drm@1.3",
"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_include_dirs: [ export_include_dirs: [
@@ -63,12 +63,12 @@ cc_test {
"android.hardware.drm@1.3", "android.hardware.drm@1.3",
"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",
], ],
test_suites: [ test_suites: [