Merge "Link dynamic libcrypto lib for Widevine unit tests."

libwvdrmengine/cdm/test/unit-test.mk

@@ -35,7 +35,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 \

libwvdrmengine/run_all_unit_tests.sh

@@ -27,7 +27,7 @@ elif [ 0 -eq `expr index "$GTEST_FILTER" "-"` ]; then
 fi
 
 # The Android supplement allows for installation in these paths:
-OEC_PATHS=/vendor/lib64:/vendor/lib
+OEC_PATHS=/vendor/lib64:/vendor/lib:/system/lib64/vndk-R:/system/lib/vndk-R
 
 # Execute a command in "adb shell" and capture the result.
 adb_shell_run() {