From 0c7dfda7e1371359149b262dbc5ba9f29c40139f Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Mon, 16 Sep 2019 14:03:37 -0700 Subject: [PATCH] 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 --- libwvdrmengine/Android.mk | 7 +++---- libwvdrmengine/mediacrypto/Android.mk | 4 ++-- libwvdrmengine/mediacrypto/test/Android.mk | 4 ++-- libwvdrmengine/mediadrm/Android.mk | 4 ++-- libwvdrmengine/mediadrm/test/Android.mk | 6 +++--- libwvdrmengine/vts/vendor_module/Android.mk | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 85d93d3b..d3a86a91 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -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 @@ -165,7 +164,6 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libcdm_utils \ - libcrypto \ libjsmn \ libwvdrmcryptoplugin \ libwvdrmdrmplugin \ @@ -173,6 +171,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ libbase \ + libcrypto \ libdl \ liblog \ libprotobuf-cpp-lite \ @@ -226,7 +225,6 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libcdm_utils \ - libcrypto \ libjsmn \ libwvdrmcryptoplugin_hidl \ libwvdrmdrmplugin_hidl \ @@ -238,6 +236,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.2 \ android.hidl.memory@1.0 \ libbase \ + libcrypto \ libdl \ libhidlbase \ libhidlmemory \ diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index 7aba4c6a..d7b4a4f4 100644 --- a/libwvdrmengine/mediacrypto/Android.mk +++ b/libwvdrmengine/mediacrypto/Android.mk @@ -24,9 +24,9 @@ LOCAL_HEADER_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libcdm_protos \ - libcrypto \ LOCAL_SHARED_LIBRARIES := \ + libcrypto \ liblog LOCAL_MODULE := libwvdrmcryptoplugin @@ -62,13 +62,13 @@ LOCAL_HEADER_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libcdm_protos \ - libcrypto \ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ android.hardware.drm@1.1 \ android.hardware.drm@1.2 \ android.hidl.memory@1.0 \ + libcrypto \ libhidlmemory \ liblog diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 31966cb0..2fa008c5 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -22,7 +22,6 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libcdm_utils \ - libcrypto \ libjsmn \ libgmock \ libgmock_main \ @@ -32,6 +31,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ libbase \ + libcrypto \ libcutils \ libdl \ liblog \ @@ -82,7 +82,6 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libcdm_utils \ - libcrypto \ libjsmn \ libgmock \ libgmock_main \ @@ -97,6 +96,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hidl.memory@1.0 \ libbase \ libbinder \ + libcrypto \ libcutils \ libdl \ libhidlbase \ diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk index a448f8e9..c292c449 100644 --- a/libwvdrmengine/mediadrm/Android.mk +++ b/libwvdrmengine/mediadrm/Android.mk @@ -63,14 +63,14 @@ LOCAL_HEADER_LIBRARIES := \ libutils_headers \ LOCAL_STATIC_LIBRARIES := \ - libcdm_protos \ - libcrypto + libcdm_protos LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ android.hardware.drm@1.1 \ android.hardware.drm@1.2 \ android.hidl.memory@1.0 \ + libcrypto \ liblog LOCAL_MODULE := libwvdrmdrmplugin_hidl diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 35fdb24a..f6cbcc33 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -23,7 +23,6 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libcdm_utils \ - libcrypto \ libjsmn \ libgmock \ libgmock_main \ @@ -33,6 +32,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ libbase \ + libcrypto \ libdl \ liblog \ libprotobuf-cpp-lite \ @@ -82,7 +82,6 @@ LOCAL_STATIC_LIBRARIES := \ libcdm \ libcdm_protos \ libcdm_utils \ - libcrypto \ libjsmn \ libgmock \ libgmock_main \ @@ -97,6 +96,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hidl.memory@1.0 \ libbinder \ libbase \ + libcrypto \ libdl \ libhidlbase \ libhidlmemory \ @@ -150,7 +150,6 @@ LOCAL_STATIC_LIBRARIES := \ libgtest \ libgtest_main \ libwvdrmdrmplugin_hidl \ - libcrypto \ libjsmn \ libwvlevel3 \ libwvdrmdrmplugin_hidl \ @@ -160,6 +159,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.1 \ android.hardware.drm@1.2 \ android.hidl.memory@1.0 \ + libcrypto \ libhidlbase \ libhidlmemory \ libhidltransport \ diff --git a/libwvdrmengine/vts/vendor_module/Android.mk b/libwvdrmengine/vts/vendor_module/Android.mk index df163117..47149834 100644 --- a/libwvdrmengine/vts/vendor_module/Android.mk +++ b/libwvdrmengine/vts/vendor_module/Android.mk @@ -25,10 +25,10 @@ LOCAL_STATIC_LIBRARIES := \ libgtest \ libcdm \ libcdm_utils \ - libcrypto LOCAL_SHARED_LIBRARIES := \ libbase \ + libcrypto \ liblog \ libssl \ libutils \