tree 37756664d68f29f27257d5ead473a74a1c66345e
parent 2a9ef17ec01fcdae1f1726494f6d97c8bebb6522
author Paul Duffin <paulduffin@google.com> 1512691363 +0000
committer Paul Duffin <paulduffin@google.com> 1512691736 +0000

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/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    BlockedNumberProviderTest results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because BlockedNumberProviderTest's source
    depends on their classes and because of these changes they are no
    longer present on the compilation path.

Bug: 30188076
Test: make checkbuild
Change-Id: Ib8dc284b20720ed6ed5c7734ad5fb23211f2449e