Stop statically including legacy-android-test
Statically including legacy-android-test leads to duplicate classes
which causes build time problems (with Proguard) and runtime problems on
older SDK versions. This change:
* Stops statically including legacy-android-test.
* Adds compile time dependencies on andoid.test.base, android.test.mock
and android.test.runner where necessary.
* Adds <uses-library android:name="android.test.runner"/> to any
affected package to ensure that the classes that were included by
legacy-android-test are still available at runtime. That also adds a
dependency on android.test.base and android.test.mock.
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/unit/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because statically including the classes in EmergencyInfoUnitTests
results in duplicate classes which leads to build time and compile
time issues.
Bug: 30188076
Test: make checkbuild
Change-Id: Idc47a20507439f7de64d542224bcba443f3cfa86
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 77edbc0..815e9b0 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -23,7 +23,6 @@
android-support-test \
emergencyinfo-test-common \
espresso-core \
- legacy-android-test \
truth-prebuilt \
ub-uiautomator