am 53d9ade2: Merge "Revert "Add XtsMediaTestCases.apk to google-tests.zip"" into mnc-dev

* commit '53d9ade2ef834a562b191aaf2d291e9dfec94ced':
  Revert "Add XtsMediaTestCases.apk to google-tests.zip"
This commit is contained in:
Chad Jones
2015-06-26 15:59:40 +00:00
committed by Android Git Automerger

View File

@@ -23,7 +23,6 @@ WIDEVINE_TEST_MAKE_TARGETS := \
policy_engine_unittest \
request_license_test \
timer_unittest \
XtsMediaTestCases \
# Call the makefiles for all our tests used in TradeFederation
MODULAR_DRM_PATH := vendor/widevine/libwvdrmengine
@@ -34,6 +33,3 @@ include $(MODULAR_DRM_PATH)/mediadrm/test/Android.mk
include $(MODULAR_DRM_PATH)/oemcrypto/test/Android.mk
include $(MODULAR_DRM_PATH)/test/unit/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