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

Move Widevine Unit Tests to Standard gMock

Browse Source 
(In addition to being a merge of http://go/wvgerrit/17394, this commit
updates tests/Android.mk to no longer try to build the private gMock.)

Previously, we maintained our own version of gMock (named libwvgmock
to avoid naming conflicts) and depended on it for our unit tests. Now
that Android has gMock in the externals/ directory and vaage@ has
eliminated the need for us to customize gMock's arity, we can stop
depending on or maintaining our own copy.

Bug: 26907374
Change-Id: Ia01d6c02e2f28a642480d7ef178b9bc3dde6d306
This commit is contained in:
John "Juce" Bruce
2016-04-01 14:49:43 -07:00
parent 0e929c2ec7
commit 0555a7c9de
51 changed files with 8 additions and 23469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Android.mk
View File

@@ -39,7 +39,6 @@ endif
# Call the makefiles for all our tests used in TradeFederation
MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine
include $(MODULAR_DRM_PATH)/test/gmock/Android.mk
include $(MODULAR_DRM_PATH)/cdm/test/Android.mk
include $(MODULAR_DRM_PATH)/mediacrypto/test/Android.mk
include $(MODULAR_DRM_PATH)/mediadrm/test/Android.mk