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

Merge "Correct unit/integration tests being aborted"

Browse Source
This commit is contained in:
Rahul Frias
2019-11-27 19:39:02 +00:00
committed by Android (Google) Code Review
parent 0e6398469d 1014e0d189
commit 923e774efa
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/integration-test.mk
View File

@@ -36,7 +36,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/test/unit/Android.mk
View File

@@ -18,11 +18,11 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcrypto_static \
libgtest \ libgtest \
libgtest_main \ libgtest_main \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcrypto \
libdl \ libdl \
liblog \ liblog \
libutils \ libutils \