From 36e943c1ae642ed9efa0dd09f48d21319369e7dd Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 18 Sep 2019 17:35:52 -0700 Subject: [PATCH] Use libcrypto_static instead of libcrypto Replace libcrypto with libcrypto_static, which can be protected through visibility to ensure only modules that don't affect FIPS certification can use it. Bug: 141248879 Test: m checkbuild Change-Id: I53757b813fe2984261a3bde963cac1886523dfdf --- libwvdrmengine/cdm/Android.mk | 3 ++- libwvdrmengine/oemcrypto/ref/Android.mk | 2 +- libwvdrmengine/test/unit/Android.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk index cd63c219..d77cd08b 100644 --- a/libwvdrmengine/cdm/Android.mk +++ b/libwvdrmengine/cdm/Android.mk @@ -20,7 +20,8 @@ LOCAL_C_INCLUDES += \ LOCAL_HEADER_LIBRARIES := \ libutils_headers -LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto +LOCAL_STATIC_LIBRARIES := libcdm_protos +LOCAL_SHARED_LIBRARIES := libcrypto SRC_DIR := src CORE_SRC_DIR := core/src diff --git a/libwvdrmengine/oemcrypto/ref/Android.mk b/libwvdrmengine/oemcrypto/ref/Android.mk index a7fdf9c7..f65cffaa 100644 --- a/libwvdrmengine/oemcrypto/ref/Android.mk +++ b/libwvdrmengine/oemcrypto/ref/Android.mk @@ -28,6 +28,7 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libbase \ + libcrypto \ libdl \ liblog \ libmedia \ @@ -37,7 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libcdm_utils \ - libcrypto \ # Proprietary modules are put in vendor/lib instead of /system/lib. LOCAL_PROPRIETARY_MODULE := true diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 7b1617f8..e25804c9 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -18,7 +18,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ - libcrypto \ + libcrypto_static \ libgtest \ libgtest_main \ @@ -64,7 +64,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ - libcrypto \ + libcrypto_static \ libgtest \ libgtest_main \