From 761d1723ffdfc6ac96e3f4ea1493e2e6f32bcb9c Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 9 Jun 2020 16:15:03 -0700 Subject: [PATCH] Replace libcrypto_static with libcrypto libcrypto_static has restricted visibility, which is now being implemented in Make, so we either need to allow it for all vendor modules, or use the shared library instead. Bug: 158599308 Test: treehugger Test: mmma vendor/widevine/libwvdrmengine Change-Id: I88ddce7ad221c66a20f4e05409ae77421e4196ad --- libwvdrmengine/oemcrypto/test/common.mk | 2 +- libwvdrmengine/test/unit/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/oemcrypto/test/common.mk b/libwvdrmengine/oemcrypto/test/common.mk index 8a0dfd84..20015f6e 100644 --- a/libwvdrmengine/oemcrypto/test/common.mk +++ b/libwvdrmengine/oemcrypto/test/common.mk @@ -32,7 +32,6 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_utils \ - libcrypto_static \ libgtest \ libgtest_main \ libwvlevel3 \ @@ -43,6 +42,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ libbase \ + libcrypto \ libdl \ liblog \ libmedia_omx \ diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 0b8cade2..2a4c9fba 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -68,7 +68,6 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ - libcrypto_static \ libgtest \ libgtest_main \ @@ -78,6 +77,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.2 \ android.hardware.drm@1.3 \ libbase \ + libcrypto \ libdl \ libhidlbase \ libhidlmemory \