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.
* packages/SettingsProvider/test/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SettingsProviderTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
SettingsProviderTest uses classes from package android.test
(possible indirectly) and needs them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
* services/tests/servicestests/Android.mk
Replaced 'android.test.runner' with 'android.test.mock' and
'legacy-android-test' in LOCAL_JAVA_LIBRARIES because module
FrameworksServicesTests uses classes from packages android.test and
android.test.mock (possible indirectly) and needs them available at
compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
They were not added to LOCAL_STATIC_JAVA_LIBRARIES because
FrameworksServicesTests's manifest file (AndroidManifest.xml)
targets API level 26 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 FrameworksServicesTests builds
against internal jars not the API and so should use libraries that
build against internal jars not the API.
* tests/AppLaunch/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppLaunch uses classes from
package android.test (possible indirectly) and needs them available
at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppLaunch's manifest file (AndroidManifest.xml) targets API
level 24 and dynamically includes the android.test.runner library
at runtime so there is no point in statically including the
classes.
* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module SmartCamera-tests uses classes
from package android.test (possible indirectly) and needs them
available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SmartCamera-tests's manifest file (AndroidManifest.xml)
targets API level 17 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
* tests/Compatibility/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppCompatibilityTest uses
classes from package android.test (possible indirectly) and needs
them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppCompatibilityTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I3d183a96bf87437028a2d4b774d311e40349f4d0
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Change-Id: I13e88297731253420e4e5f5291d503f13a39a156
