Commit Graph

5 Commits

Author SHA1 Message Date
John "Juce" Bruce
0555a7c9de Move Widevine Unit Tests to Standard gMock
(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
2016-04-01 14:49:43 -07:00
Kyle Alexander
5aff60980e Add XtsMediaTestCases.apk to google-tests.zip
Need to add our Xts Media tests to the test package, so that we can
execute those tests with our nightly regression.

Previous cl (716634) for this was rolled back, as it didn't conditionally
check for the presence of vendor/xts to the build environment before adding
the dependency. This cl corrects that, and verified by removing vendor/xts
from the build environment, and validated that both make tests built
successfully, and the generated google-tests.zip was created as expected
(only missing XtsMediaTestCases.apk).

Bug: 22094009
Change-Id: Ia4e5ee0abbaf1e0efc591d6db34aa3f35ac62330
2015-10-06 14:06:59 -07:00
Chad Jones
c72407657a Revert "Add XtsMediaTestCases.apk to google-tests.zip"
This reverts commit fe71d17236.

Change-Id: I8119b307b7fa4dd0a9971e37c6c004de10400233
2015-06-26 15:33:56 +00:00
Kyle Alexander
fe71d17236 Add XtsMediaTestCases.apk to google-tests.zip
Need to add our Xts Media tests to the test package, so that we can
execute those tests with our nightly regression.

Bug: 22094009
Change-Id: I7e7ed8bf5f6edb905832495bea6347f97b6c5894
2015-06-25 12:22:36 -07:00
Kyle Alexander
50704657e5 Makefile to include Widevine tests in google_tests.zip package.
Inclusion depends on a subsequent cl in vendor/google,
referencing the WIDEVINE_TEST_MAKE_TARGETS variable within.

Subsequent cl: https://googleplex-android-review.git.corp.google.com/681048

Change-Id: Ibaad415213b193dfb55426e4a9d725e39f4c05b3
2015-04-28 13:17:23 -07:00