OSDN Git Service

Prepare for removal of junit and android.test classes from Android API (step 1)
authorPaul Duffin <paulduffin@google.com>
Wed, 1 Mar 2017 13:21:10 +0000 (13:21 +0000)
committerPaul Duffin <paulduffin@google.com>
Mon, 8 May 2017 18:33:27 +0000 (19:33 +0100)
commit702d506d5788e39e83cc7ba6495f0d5410b46e7a
treeefa1ca0be77119c15076d0b15729ea349102f806
parentd308803b82f5317eebafdf3a97baff3bcd460e60
Prepare for removal of junit and android.test classes from Android API (step 1)

In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Ice80a29b420061f5d0af6eb46426455abf890e5e
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
cmds/uiautomator/instrumentation/Android.mk
core/tests/hosttests/test-apps/ExternalLocAllPermsTestApp/Android.mk
core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk
core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk
core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk
core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk
services/tests/shortcutmanagerutils/Android.mk
tests/SurfaceComposition/Android.mk
tests/WindowAnimationJank/Android.mk