From 85c065986f6e7bdf9989c60f92c5f2da68d93ed5 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 16 Nov 2017 12:57:31 +0000 Subject: [PATCH] Use a.t.mock.stubs instead of a.t.mock.sdk Remove dependencies on android.test.mock.sdk as it is a duplicate of android.test.mock.stubs and will be removed. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been deprecated. Bug: 30188076 Test: make checkbuild Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1 Merged-In: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1 (cherry picked from commit 097130d1986b8a921c79b064991090e48173e5b9) --- tests/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Android.mk b/tests/Android.mk index 998c1dee2..5c2c2c76e 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -28,7 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-target-minus-junit4 -LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.mock.stubs legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src)