commit 99bf0a23d135ed007ee86891a5c120ec65778daf
author Kim Lindberger <kim.lindberger@gmail.com> Wed Dec 13 18:31:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 13 18:31:38 2017 +0000
tree 418537b96cd8fb76ac18243fe130217fde317773
parent 0e278f66e4f158023700ee0186bc565e6db48d2c
parent ac20c8eedebc226cfd022efb13d0446d952d25c1

Merge "Fix calendar alarms not being triggered after 22h" am: 3525221de1 am: 0fa463b835
am: ac20c8eede

Change-Id: I75b3d0e014ba7f37cdd59eca7243a720147d2cd9

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 86cac8a..78167ec 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,9 +10,14 @@
 LOCAL_PACKAGE_NAME := CalendarProviderTests
 LOCAL_COMPATIBILITY_SUITE := device-tests
 
-LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit
 
-LOCAL_JAVA_LIBRARIES := ext android.test.runner
+LOCAL_JAVA_LIBRARIES := \
+    ext \
+    android.test.runner \
+    android.test.base \
+    android.test.mock \
+
 
 LOCAL_INSTRUMENTATION_FOR := CalendarProvider