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

Commit d0352a86 authored Mar 03, 2020 by Automerger Merge Worker

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

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

Change-Id: Iea287ba987fa1250e2cef1d3ef9bf0b50b7f8d43

parents 464d55c7 ea9e71ac

drm/1.0/vts/functional/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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",
		],
		arch: {

drm/1.2/vts/functional/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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",
		],
		arch: {