Merge "Correct unit/integration tests being aborted"

2019-11-27 19:39:02 +00:00
parent 0e6398469d 1014e0d189
commit 923e774efa
2 changed files with 2 additions and 2 deletions
--- 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 \
--- 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 \