Commit f831a344 authored by Paul Duffin's avatar Paul Duffin
Browse files

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.

* tests/functional/applinktests/Android.mk
    Replaced 'android.test.runner' with 'legacy-android-test' in
    LOCAL_JAVA_LIBRARIES because module AppLinkFunctionalTests builds
    against 'LOCAL_SDK_VERSION := current' and uses classes from
    package android.test (possibly indirectly) so will no longer
    compile once they are removed from the API.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because AppLinkFunctionalTests'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/functional/downloadapp/Android.mk
    Replaced 'android.test.runner' with 'legacy-android-test' in
    LOCAL_JAVA_LIBRARIES because module DownloadAppFunctionalTests
    builds against 'LOCAL_SDK_VERSION := current' and uses classes from
    package android.test (possibly indirectly) so will no longer
    compile once they are removed from the API.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because DownloadAppFunctionalTests'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/functional/notificationtests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because NotificationFunctionalTests'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    NotificationFunctionalTests 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.

* tests/functional/overviewtests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because OverviewFunctionalTests'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    OverviewFunctionalTests builds against 'LOCAL_SDK_VERSION :=
    current' and uses classes from package android.test (possibly
    indirectly) so will no longer compile once they are removed from
    the API.

* tests/functional/permission/Android.mk
    Replaced 'android.test.runner' with 'legacy-android-test' in
    LOCAL_JAVA_LIBRARIES because module PermissionFunctionalTests
    builds against 'LOCAL_SDK_VERSION := current' and uses classes from
    package android.test (possibly indirectly) so will no longer
    compile once they are removed from the API.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because PermissionFunctionalTests'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.

* tests/jank/jankmicrobenchmark/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because JankMicroBenchmarkTests'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    JankMicroBenchmarkTests builds against 'LOCAL_SDK_VERSION :=
    current' and uses classes from package android.test (possibly
    indirectly) so will no longer compile once they are removed from
    the API.

* tests/jank/sysapp_wear/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because SysAppJankTestsWear'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    SysAppJankTestsWear builds against 'LOCAL_SDK_VERSION := current'
    and uses classes from package android.test (possibly indirectly) so
    will no longer compile once they are removed from the API.

* tests/jank/touch_latency_wear/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because TouchLatencyJankTestWear'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    TouchLatencyJankTestWear builds against 'LOCAL_SDK_VERSION :=
    current' and uses classes from package android.test (possibly
    indirectly) so will no longer compile once they are removed from
    the API.

* tests/jank/uibench/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because UiBenchJankTests'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    UiBenchJankTests builds against 'LOCAL_SDK_VERSION := current' and
    uses classes from package android.test (possibly indirectly) so
    will no longer compile once they are removed from the API.

* tests/jank/uibench_wear/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because UiBenchJankTestsWear'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.

    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    UiBenchJankTestsWear builds against 'LOCAL_SDK_VERSION := current'
    and uses classes from package android.test (possibly indirectly) so
    will no longer compile once they are removed from the API.

* tests/perf/PerfTransitionTest/Android.mk
    Removed android.test.runner from LOCAL_JAVA_LIBRARIES because
    module AppTransitionTests does not use any classes from
    android.test.runner at compile time

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because AppTransitionTests'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. It was not added to
    LOCAL_JAVA_LIBRARIES because module AppTransitionTests does not
    have any dependencies on android.test classes

* tests/perf/PerformanceAppTest/Android.mk
    Replaced 'android.test.runner' with 'legacy-android-test' in
    LOCAL_JAVA_LIBRARIES because module PerformanceAppTest 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 PerformanceAppTest's manifest file (AndroidManifest.xml)
    targets API level 22 and dynamically includes the
    android.test.runner library at runtime so there is no point in
    statically including the classes.

* tests/perf/PowerPerfTest/Android.mk
    Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
    PowerPerfTest 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.

    It was not added to LOCAL_STATIC_JAVA_LIBRARIES because
    PowerPerfTest's manifest file (AndroidManifest.xml) targets API
    level 22 and uses the android.test.runner library which will
    provide the classes dynamically at runtime.

* utils/permissions/Android.mk
    Removed android.test.runner from LOCAL_JAVA_LIBRARIES because
    module PermissionUtils does not use any classes from
    android.test.runner at compile time

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: Ic9010c9cb201c761ce85514db8d62198a9304cd2
Merged-In: I759378bb94407c299e2dbd328e63ebae2eceb2ae
parent da676523
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment