From fe71d17236fca07daf1b67d72fc67aa4f9dbc976 Mon Sep 17 00:00:00 2001
From: Kyle Alexander <kylealexander@google.com>
Date: Thu, 25 Jun 2015 12:22:36 -0700
Subject: [PATCH] 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
---
 tests/Android.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/Android.mk b/tests/Android.mk
index fb522fc9..600319a6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -23,6 +23,7 @@ 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
@@ -33,3 +34,6 @@ 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