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

Link dynamic libcrypto lib for Widevine unit tests.

Browse Source 
The use of static libcrypto.so breaks FIPS cert.
Switch to use dynamic libcrypto.so.

Also merge in http://go/ag/9416801 changes. Static
libcrypto can be used for modules that do not affect
FIPS cert.

Merged from http://go/wvgerrit/86345

Test: Widevine unit tests, Play Movies & TV, Netflix
Test: quick GTS playback tests
  ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts -m GtsMediaTestCases --test com.google.android.media.gts.MediaDrmTest#testWidevineApi29

  ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts -m GtsExoPlayerTestCases --test com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed

bug: 141150503
Change-Id: I6427c5a86e52e9cfb800d35ac0a3a67011039d10
This commit is contained in:
Edwin Wong
2019-09-20 13:48:01 -07:00
parent 170438a576
commit c8ee9e5668
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() {