From d85c649e5bf6e3627037bc1ae24281f3840b3f43 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Wed, 26 Feb 2020 15:25:51 -0800 Subject: [PATCH] drm vts: link dynamic libcrypto.so to pass FIPS Bug: 149035295 Test: VtsHalDrmV1_0TargetTest Test: VtsHalDrmV1_2TargetTest Change-Id: I6206e39411ccf0ccd72dd02d9b9d932f7d488a42 --- drm/1.0/vts/functional/Android.bp | 4 ++-- drm/1.2/vts/functional/Android.bp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index 235bfb406f..bc8ff23645 100644 --- a/drm/1.0/vts/functional/Android.bp +++ b/drm/1.0/vts/functional/Android.bp @@ -43,12 +43,12 @@ cc_library_static { "android.hardware.drm@1.0", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", + "libcrypto", "libhidlmemory", "libnativehelper", ], static_libs: [ "android.hardware.drm@1.0-helper", - "libcrypto_static", "libdrmvtshelper", ], export_shared_lib_headers: [ @@ -76,12 +76,12 @@ cc_test { "android.hardware.drm@1.0", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", + "libcrypto", "libhidlmemory", "libnativehelper", ], static_libs: [ "android.hardware.drm@1.0-helper", - "libcrypto_static", "libdrmvtshelper", ], test_suites: [ diff --git a/drm/1.2/vts/functional/Android.bp b/drm/1.2/vts/functional/Android.bp index ecc7d6c592..3c356ed5a1 100644 --- a/drm/1.2/vts/functional/Android.bp +++ b/drm/1.2/vts/functional/Android.bp @@ -31,12 +31,12 @@ cc_library_static { "android.hardware.drm@1.2", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", + "libcrypto", "libhidlmemory", "libnativehelper", ], static_libs: [ "android.hardware.drm@1.0-helper", - "libcrypto_static", "libdrmvtshelper", ], export_shared_lib_headers: [ @@ -63,11 +63,11 @@ cc_test { "android.hardware.drm@1.0", "android.hardware.drm@1.2", "android.hidl.allocator@1.0", + "libcrypto", "libhidlmemory", ], static_libs: [ "android.hardware.drm@1.0-helper", - "libcrypto_static", "libdrmvtshelper", ], test_suites: [