diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index a69295ac..c9cf07f1 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -49,7 +49,7 @@ LOCAL_MODULE := libcdm_utils
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_PROPRIETARY_MODULE := true
 
-LOCAL_STATIC_LIBRARIES := libcrypto_static
+LOCAL_STATIC_LIBRARIES := libcrypto
 
 LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/cdm/core/include \
@@ -160,7 +160,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto_static \
+  libcrypto \
   libjsmn \
   libwvdrmcryptoplugin \
   libwvdrmdrmplugin \
@@ -220,7 +220,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto_static \
+  libcrypto \
   libjsmn \
   libwvdrmcryptoplugin_hidl \
   libwvdrmdrmplugin_hidl \
diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk
index 354b43d1..c6060edc 100644
--- a/libwvdrmengine/cdm/Android.mk
+++ b/libwvdrmengine/cdm/Android.mk
@@ -18,7 +18,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_HEADER_LIBRARIES := \
     libutils_headers
 
-LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static
+LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto
 
 SRC_DIR := src
 CORE_SRC_DIR := core/src
diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk
index 341f2755..8f83f7c1 100644
--- a/libwvdrmengine/mediacrypto/Android.mk
+++ b/libwvdrmengine/mediacrypto/Android.mk
@@ -23,7 +23,7 @@ LOCAL_HEADER_LIBRARIES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm_protos \
-  libcrypto_static \
+  libcrypto \
 
 LOCAL_SHARED_LIBRARIES := \
   liblog
@@ -60,7 +60,7 @@ LOCAL_HEADER_LIBRARIES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm_protos \
-  libcrypto_static \
+  libcrypto \
   libwidevinehidl_utils \
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index 8f933610..a383c666 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -21,7 +21,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto_static \
+  libcrypto \
   libjsmn \
   libgmock \
   libgmock_main \
@@ -78,7 +78,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto_static \
+  libcrypto \
   libjsmn \
   libgmock \
   libgmock_main \
diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk
index c5a9cb98..30141745 100644
--- a/libwvdrmengine/mediadrm/Android.mk
+++ b/libwvdrmengine/mediadrm/Android.mk
@@ -61,7 +61,7 @@ LOCAL_HEADER_LIBRARIES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm_protos \
-  libcrypto_static
+  libcrypto
 
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm@1.0 \
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index bfcdf1ce..1a123fbf 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -22,7 +22,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto_static \
+  libcrypto \
   libjsmn \
   libgmock \
   libgmock_main \
@@ -79,7 +79,7 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
   libcdm_utils \
-  libcrypto_static \
+  libcrypto \
   libjsmn \
   libgmock \
   libgmock_main \
diff --git a/libwvdrmengine/oemcrypto/mock/Android.mk b/libwvdrmengine/oemcrypto/mock/Android.mk
index 8f0270ef..f2b406be 100644
--- a/libwvdrmengine/oemcrypto/mock/Android.mk
+++ b/libwvdrmengine/oemcrypto/mock/Android.mk
@@ -39,7 +39,7 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_STATIC_LIBRARIES := \
     libcdm_utils \
-    libcrypto_static \
+    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 ef0fed0f..c721c488 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_static \
+  libcrypto \
   libgtest \
   libgtest_main \
 
@@ -63,7 +63,7 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
-  libcrypto_static \
+  libcrypto \
   libgtest \
   libgtest_main \
 
diff --git a/libwvdrmengine/vts/vendor_module/Android.mk b/libwvdrmengine/vts/vendor_module/Android.mk
index 782ca00a..2812e80a 100644
--- a/libwvdrmengine/vts/vendor_module/Android.mk
+++ b/libwvdrmengine/vts/vendor_module/Android.mk
@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES := \
     libgtest \
     libcdm \
     libcdm_utils \
-    libcrypto_static
+    libcrypto
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \