From 8032648726b8f7cd5acf46c608a18a9c5050b616 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 7 Mar 2017 12:15:00 +0000 Subject: Remove unnecessary direct dependency on dexmaker The mockito-target library already statically includes dexmaker so the direct dependency is unnecessary and could make the upgrade of mockito more difficult. This is part of the cleanup work prior to upgrading mockito. I ran the tests before and after the change and in both cases got 2 failures and between 4-6 errors; at least some of the errors are flaky as the exact number changed from one run to the next. Bug: 32912773 Test: clean make of DownloadProviderTests, verify still includes dexmaker classes Change-Id: I8133d0869a2b0ff7a9ffc19daff61ed1bbc6a7f6 --- tests/Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/Android.mk b/tests/Android.mk index dc3cbbad..6e015c0a 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -10,7 +10,6 @@ LOCAL_INSTRUMENTATION_FOR := DownloadProvider LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := \ mockwebserver \ - dexmaker \ mockito-target \ legacy-android-test LOCAL_PACKAGE_NAME := DownloadProviderTests -- cgit v1.2.3