From 1014e0d1898b919b22f328d87ec14dac300053cd Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Fri, 22 Nov 2019 11:39:35 -0800
Subject: [PATCH] Correct unit/integration tests being aborted

[ Merge of http://go/wvgerrit/90244 ]

Tests now link with the dynamic rather than static version of libcrypto.

Bug: 145007632
Test: Unit/integration test
Change-Id: I62e34cac8fdbb8fcf7da5dc8bea142bf2aa76a2f
---
 libwvdrmengine/cdm/test/integration-test.mk | 2 +-
 libwvdrmengine/test/unit/Android.mk         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libwvdrmengine/cdm/test/integration-test.mk b/libwvdrmengine/cdm/test/integration-test.mk
index 5069c66a..a8feaf29 100644
--- a/libwvdrmengine/cdm/test/integration-test.mk
+++ b/libwvdrmengine/cdm/test/integration-test.mk
@@ -36,7 +36,6 @@ LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
     libcdm_utils \
-    libcrypto_static \
     libjsmn \
     libgmock \
     libgtest \
@@ -44,6 +43,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_SHARED_LIBRARIES := \
     libbase \
+    libcrypto \
     libdl \
     liblog \
     libmedia_omx \
diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk
index e25804c9..9f893b37 100644
--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -18,11 +18,11 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
-  libcrypto_static \
   libgtest \
   libgtest_main \
 
 LOCAL_SHARED_LIBRARIES := \
+  libcrypto \
   libdl \
   liblog \
   libutils \