From c8ee9e56682dcefdbdede02be73a0447e4e9ba63 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Fri, 20 Sep 2019 13:48:01 -0700 Subject: [PATCH] Link dynamic libcrypto lib for Widevine unit tests. 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 --- libwvdrmengine/cdm/test/unit-test.mk | 2 +- libwvdrmengine/run_all_unit_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index 0bebaf9c..8b2319b6 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/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 \ diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh index addf9424..b913d5a3 100755 --- a/libwvdrmengine/run_all_unit_tests.sh +++ b/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() {