Fix dependencies of packages that target earlier releases

A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

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.

* Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because Dialer's manifest file (AndroidManifest.xml) targets API
    level 23 and dynamically includes the android.test.runner library
    at runtime so there is no point in statically including the
    classes. It was not added to LOCAL_JAVA_LIBRARIES because module
    Dialer does not have any dependencies on android.test classes

* tests/Android.mk
    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module DialerTests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    They were not added to LOCAL_STATIC_JAVA_LIBRARIES because
    DialerTests's manifest file (AndroidManifest.xml) targets API level
    23 and uses the android.test.runner library which will provide the
    classes dynamically at runtime.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module DialerTests builds against the
    API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: Ia69a25caeef20017c311f45d046fbccb83ea7394
Merged-In: I10c2c5f315e442477be81726e7df20d569fe5305
Merged-In: I37a618deba48d87a1a03d82ad4022233b408a788

2 files changed, 2 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 91e127040..45a5b8d4e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     com.android.vcard \
     guava \
     libphonenumber \
-    legacy-android-test \
     junit
 
 LOCAL_PACKAGE_NAME := Dialer
diff --git a/tests/Android.mk b/tests/Android.mk
index 07f4f00d9..53cb238ef 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,6 +19,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_STATIC_JAVA_LIBRARIES += \
         mockito-target
 
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
+
 LOCAL_PACKAGE_NAME := DialerTests
 
 LOCAL_INSTRUMENTATION_FOR := Dialer