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
This commit is contained in:
@@ -73,8 +73,6 @@ LOCAL_MODULE := libcdm_utils
|
|||||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||||
LOCAL_PROPRIETARY_MODULE := true
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := libcrypto
|
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_C_INCLUDES := \
|
||||||
vendor/widevine/libwvdrmengine/cdm/core/include \
|
vendor/widevine/libwvdrmengine/cdm/core/include \
|
||||||
vendor/widevine/libwvdrmengine/cdm/include \
|
vendor/widevine/libwvdrmengine/cdm/include \
|
||||||
@@ -87,6 +85,7 @@ LOCAL_HEADER_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
liblog \
|
liblog \
|
||||||
|
libcrypto
|
||||||
|
|
||||||
LOCAL_CFLAGS := -DCORE_UTIL_IMPLEMENTATION
|
LOCAL_CFLAGS := -DCORE_UTIL_IMPLEMENTATION
|
||||||
|
|
||||||
@@ -165,7 +164,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcdm \
|
libcdm \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libwvdrmcryptoplugin \
|
libwvdrmcryptoplugin \
|
||||||
libwvdrmdrmplugin \
|
libwvdrmdrmplugin \
|
||||||
@@ -173,6 +171,7 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
libbase \
|
libbase \
|
||||||
|
libcrypto \
|
||||||
libdl \
|
libdl \
|
||||||
liblog \
|
liblog \
|
||||||
libprotobuf-cpp-lite \
|
libprotobuf-cpp-lite \
|
||||||
@@ -226,7 +225,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcdm \
|
libcdm \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libwvdrmcryptoplugin_hidl \
|
libwvdrmcryptoplugin_hidl \
|
||||||
libwvdrmdrmplugin_hidl \
|
libwvdrmdrmplugin_hidl \
|
||||||
@@ -238,6 +236,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||||||
android.hardware.drm@1.2 \
|
android.hardware.drm@1.2 \
|
||||||
android.hidl.memory@1.0 \
|
android.hidl.memory@1.0 \
|
||||||
libbase \
|
libbase \
|
||||||
|
libcrypto \
|
||||||
libdl \
|
libdl \
|
||||||
libhidlbase \
|
libhidlbase \
|
||||||
libhidlmemory \
|
libhidlmemory \
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ LOCAL_HEADER_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcrypto \
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
|
libcrypto \
|
||||||
liblog
|
liblog
|
||||||
|
|
||||||
LOCAL_MODULE := libwvdrmcryptoplugin
|
LOCAL_MODULE := libwvdrmcryptoplugin
|
||||||
@@ -62,13 +62,13 @@ LOCAL_HEADER_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcrypto \
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
android.hardware.drm@1.0 \
|
android.hardware.drm@1.0 \
|
||||||
android.hardware.drm@1.1 \
|
android.hardware.drm@1.1 \
|
||||||
android.hardware.drm@1.2 \
|
android.hardware.drm@1.2 \
|
||||||
android.hidl.memory@1.0 \
|
android.hidl.memory@1.0 \
|
||||||
|
libcrypto \
|
||||||
libhidlmemory \
|
libhidlmemory \
|
||||||
liblog
|
liblog
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcdm \
|
libcdm \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libgmock \
|
libgmock \
|
||||||
libgmock_main \
|
libgmock_main \
|
||||||
@@ -32,6 +31,7 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
libbase \
|
libbase \
|
||||||
|
libcrypto \
|
||||||
libcutils \
|
libcutils \
|
||||||
libdl \
|
libdl \
|
||||||
liblog \
|
liblog \
|
||||||
@@ -82,7 +82,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcdm \
|
libcdm \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libgmock \
|
libgmock \
|
||||||
libgmock_main \
|
libgmock_main \
|
||||||
@@ -97,6 +96,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||||||
android.hidl.memory@1.0 \
|
android.hidl.memory@1.0 \
|
||||||
libbase \
|
libbase \
|
||||||
libbinder \
|
libbinder \
|
||||||
|
libcrypto \
|
||||||
libcutils \
|
libcutils \
|
||||||
libdl \
|
libdl \
|
||||||
libhidlbase \
|
libhidlbase \
|
||||||
|
|||||||
@@ -63,14 +63,14 @@ LOCAL_HEADER_LIBRARIES := \
|
|||||||
libutils_headers \
|
libutils_headers \
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
libcdm_protos \
|
libcdm_protos
|
||||||
libcrypto
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
android.hardware.drm@1.0 \
|
android.hardware.drm@1.0 \
|
||||||
android.hardware.drm@1.1 \
|
android.hardware.drm@1.1 \
|
||||||
android.hardware.drm@1.2 \
|
android.hardware.drm@1.2 \
|
||||||
android.hidl.memory@1.0 \
|
android.hidl.memory@1.0 \
|
||||||
|
libcrypto \
|
||||||
liblog
|
liblog
|
||||||
|
|
||||||
LOCAL_MODULE := libwvdrmdrmplugin_hidl
|
LOCAL_MODULE := libwvdrmdrmplugin_hidl
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcdm \
|
libcdm \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libgmock \
|
libgmock \
|
||||||
libgmock_main \
|
libgmock_main \
|
||||||
@@ -33,6 +32,7 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
libbase \
|
libbase \
|
||||||
|
libcrypto \
|
||||||
libdl \
|
libdl \
|
||||||
liblog \
|
liblog \
|
||||||
libprotobuf-cpp-lite \
|
libprotobuf-cpp-lite \
|
||||||
@@ -82,7 +82,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcdm \
|
libcdm \
|
||||||
libcdm_protos \
|
libcdm_protos \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libgmock \
|
libgmock \
|
||||||
libgmock_main \
|
libgmock_main \
|
||||||
@@ -97,6 +96,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||||||
android.hidl.memory@1.0 \
|
android.hidl.memory@1.0 \
|
||||||
libbinder \
|
libbinder \
|
||||||
libbase \
|
libbase \
|
||||||
|
libcrypto \
|
||||||
libdl \
|
libdl \
|
||||||
libhidlbase \
|
libhidlbase \
|
||||||
libhidlmemory \
|
libhidlmemory \
|
||||||
@@ -150,7 +150,6 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libgtest \
|
libgtest \
|
||||||
libgtest_main \
|
libgtest_main \
|
||||||
libwvdrmdrmplugin_hidl \
|
libwvdrmdrmplugin_hidl \
|
||||||
libcrypto \
|
|
||||||
libjsmn \
|
libjsmn \
|
||||||
libwvlevel3 \
|
libwvlevel3 \
|
||||||
libwvdrmdrmplugin_hidl \
|
libwvdrmdrmplugin_hidl \
|
||||||
@@ -160,6 +159,7 @@ LOCAL_SHARED_LIBRARIES := \
|
|||||||
android.hardware.drm@1.1 \
|
android.hardware.drm@1.1 \
|
||||||
android.hardware.drm@1.2 \
|
android.hardware.drm@1.2 \
|
||||||
android.hidl.memory@1.0 \
|
android.hidl.memory@1.0 \
|
||||||
|
libcrypto \
|
||||||
libhidlbase \
|
libhidlbase \
|
||||||
libhidlmemory \
|
libhidlmemory \
|
||||||
libhidltransport \
|
libhidltransport \
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libgtest \
|
libgtest \
|
||||||
libcdm \
|
libcdm \
|
||||||
libcdm_utils \
|
libcdm_utils \
|
||||||
libcrypto
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
libbase \
|
libbase \
|
||||||
|
libcrypto \
|
||||||
liblog \
|
liblog \
|
||||||
libssl \
|
libssl \
|
||||||
libutils \
|
libutils \
|
||||||
|
|||||||
Reference in New Issue
Block a user