Link dynamic libcrypto.so to resolve FIPS cert breakage.

Switch Widevine service to link dynamic libcrypto.so.

Merge from http://go/wvgerrit/86323

Test: Play Movies & TV, Netflix, ExoPlayer, GTS
bug: 141082724
Change-Id: I16a7de4dab69bf3b4b550bb2ee202f4600682837
Merged-In: I16a7de4dab69bf3b4b550bb2ee202f4600682837
(cherry picked from commit 0c7dfda7e1)
This commit is contained in:
Edwin Wong
2019-09-16 14:03:37 -07:00
committed by Colin Cross
parent 36e943c1ae
commit 42893d22b6
6 changed files with 13 additions and 14 deletions

View File

@@ -73,8 +73,6 @@ LOCAL_MODULE := libcdm_utils
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_PROPRIETARY_MODULE := true
LOCAL_STATIC_LIBRARIES := libcrypto
LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/cdm/include \
@@ -87,6 +85,7 @@ LOCAL_HEADER_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
liblog \
libcrypto
LOCAL_CFLAGS := -DCORE_UTIL_IMPLEMENTATION
@@ -164,7 +163,6 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils \
libcrypto \
libjsmn \
libwvdrmcryptoplugin \
libwvdrmdrmplugin \
@@ -172,6 +170,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
libbase \
libcrypto \
libdl \
liblog \
libprotobuf-cpp-lite \
@@ -225,7 +224,6 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils \
libcrypto \
libjsmn \
libwvdrmcryptoplugin_hidl \
libwvdrmdrmplugin_hidl \
@@ -237,6 +235,7 @@ LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.2 \
android.hidl.memory@1.0 \
libbase \
libcrypto \
libdl \
libhidlbase \
libhidlmemory \