Use libcrypto_static instead of libcrypto am: 36e943c1ae

am: 94c13796f2

Change-Id: I42383da031eedb9849174c6da08318e399bf3e3d

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

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

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 \