am 090bb6f2: am 7c1c5f77: Merge "Add XtsMediaTestCases.apk to google-tests.zip" into mnc-dev

* commit '090bb6f2f6ef6a5a08c4c1b1bd89d1cf07bffcfa':
  Add XtsMediaTestCases.apk to google-tests.zip
This commit is contained in:
Kyle Alexander
2015-06-25 22:29:04 +00:00
committed by Android Git Automerger

View File

@@ -23,6 +23,7 @@ WIDEVINE_TEST_MAKE_TARGETS := \
policy_engine_unittest \ policy_engine_unittest \
request_license_test \ request_license_test \
timer_unittest \ timer_unittest \
XtsMediaTestCases \
# Call the makefiles for all our tests used in TradeFederation # Call the makefiles for all our tests used in TradeFederation
MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine
@@ -33,3 +34,6 @@ include $(MODULAR_DRM_PATH)/mediadrm/test/Android.mk
include $(MODULAR_DRM_PATH)/oemcrypto/test/Android.mk include $(MODULAR_DRM_PATH)/oemcrypto/test/Android.mk
include $(MODULAR_DRM_PATH)/test/unit/Android.mk include $(MODULAR_DRM_PATH)/test/unit/Android.mk
include $(MODULAR_DRM_PATH)/test/java/Android.mk include $(MODULAR_DRM_PATH)/test/java/Android.mk
# Include the makefile for our media tests from XTS
include vendor/xts/xts-tests/tests/media/Android.mk