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

Fix generic crypto tests

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/56524

Test: unit tests, including generic crypto tests, pass.
Bug: 72354901 Fix Generic Crypto tests.
Change-Id: I39404424acb2d896afe06c461a02e3664c0f45de
This commit is contained in:
Fred Gylys-Colwell
2018-08-03 17:11:01 -07:00
parent 5095bb746e
commit b849630a6f
4 changed files with 205 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/cdm/test/Android.mk
View File

@@ -65,11 +65,10 @@ test_name := file_utils_unittest
test_src_dir := .
include $(LOCAL_PATH)/unit-test.mk
# TODO(fredgc): Fix in later CL.
# test_name := generic_crypto_unittest
# test_src_dir := ../core/test
# test_main := ../core/test/test_main.cpp
# include $(LOCAL_PATH)/integration-test.mk
test_name := generic_crypto_unittest
test_src_dir := ../core/test
test_main := ../core/test/test_main.cpp
include $(LOCAL_PATH)/integration-test.mk
test_name := http_socket_test
test_src_dir := ../core/test