widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Edwin Wong
2019-09-21 00:55:07 +00:00
committed by Android (Google) Code Review
parent eb54612580 c8ee9e5668
commit cacd51938d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -35,7 +35,6 @@ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \
libcdm_utils \ libcdm_utils \
libcrypto_static \
libjsmn \ libjsmn \
libgmock \ libgmock \
libgtest \ libgtest \
@@ -44,6 +43,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbase \ libbase \
libcrypto \
libdl \ libdl \
liblog \ liblog \
libmedia_omx \ libmedia_omx \

2
libwvdrmengine/run_all_unit_tests.sh
View File

@@ -27,7 +27,7 @@ elif [ 0 -eq `expr index "$GTEST_FILTER" "-"` ]; then
fi fi
# The Android supplement allows for installation in these paths: # 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. # Execute a command in "adb shell" and capture the result.
adb_shell_run() { adb_shell_run() {