Flatten dependency hierarchy of legacy-android-test
Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).
Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.
This change modifies APKS that statically include the
legacy-android-test library indirectly.
* If the APK manifest uses the android.test.runner library then the APK
is modified to stop statically including legacy-android-test and
instead build against android.test.base/mock/runner libraries instead.
* Otherwise, the APK statically includes legacy-android-test.
Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.
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.
* libraries/aupt-lib/Android.mk
Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because AuptLib
has a source dependency on its classes
* libraries/metrics-helper/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because metrics-helper-lib is not a package so does not need to
statically include the classes
* libraries/metrics-helper/tests/Android.mk
Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
MetricsHelperTests's source depends on its classes and because of
these changes they are no longer present on the compilation path.
The classes do not need to be statically included because the
classes will be provided by the runtime, either from the default
bootclasspath or from the android.test.runner library that
MetricsHelperTests specifies in its manifest.
* libraries/power-helper/Android.mk
Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
PowerTestHelper-src has a source dependency on its classes
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because PowerTestHelper-src is not a package so does not need to
statically include the classes
* libraries/system-helpers/sysui-helper/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because sysui-helper is not a package so does not need to
statically include the classes
* tests/functional/applinktests/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as AppLinkFunctionalTests's source does not depend on
classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that AppLinkFunctionalTests specifies
in its manifest.
* tests/functional/calculator/Android.mk
Replaced 'legacy-android-test' with 'android.test.base' in
LOCAL_JAVA_LIBRARIES because CalculatorFunctionalTests's source
depends on its classes. The classes do not need to be statically
included because the classes will be provided by the runtime,
either from the default bootclasspath or from the
android.test.runner library that CalculatorFunctionalTests
specifies in its manifest.
* tests/functional/downloadapp/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as DownloadAppFunctionalTests's source does not depend
on classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that DownloadAppFunctionalTests
specifies in its manifest.
* tests/functional/notificationtests/Android.mk
Replaced 'legacy-android-test' with 'android.test.base' in
LOCAL_JAVA_LIBRARIES because NotificationFunctionalTests's source
depends on its classes. The classes do not need to be statically
included because the classes will be provided by the runtime,
either from the default bootclasspath or from the
android.test.runner library that NotificationFunctionalTests
specifies in its manifest.
* tests/functional/overviewtests/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as OverviewFunctionalTests's source does not depend on
classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that OverviewFunctionalTests specifies
in its manifest.
* tests/functional/permission/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as PermissionFunctionalTests's source does not depend
on classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that PermissionFunctionalTests
specifies in its manifest.
* tests/functional/systemmetrics/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as SystemMetricsFunctionalTests's source does not
depend on classes from legacy-android-test. The classes do not need
to be statically included because the classes will be provided by
the runtime, either from the default bootclasspath or from the
android.test.runner library that SystemMetricsFunctionalTests
specifies in its manifest.
* tests/jank/UbSystemUiJankTests/Android.mk
Replaced 'legacy-android-test' with 'android.test.base' in
LOCAL_JAVA_LIBRARIES because UbSystemUiJankTests's source depends
on its classes. The classes do not need to be statically included
because the classes will be provided by the runtime, either from
the default bootclasspath or from the android.test.runner library
that UbSystemUiJankTests specifies in its manifest.
* tests/jank/jankmicrobenchmark/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as JankMicroBenchmarkTests's source does not depend on
classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that JankMicroBenchmarkTests specifies
in its manifest.
* tests/jank/sysapp_wear/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as SysAppJankTestsWear's source does not depend on
classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that SysAppJankTestsWear specifies in
its manifest.
* tests/jank/touch_latency_wear/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as TouchLatencyJankTestWear's source does not depend on
classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that TouchLatencyJankTestWear specifies
in its manifest.
* tests/jank/uibench/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as UiBenchJankTests's source does not depend on classes
from legacy-android-test. The classes do not need to be statically
included because the classes will be provided by the runtime,
either from the default bootclasspath or from the
android.test.runner library that UiBenchJankTests specifies in its
manifest.
* tests/jank/uibench_wear/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
unnecessary as UiBenchJankTestsWear's source does not depend on
classes from legacy-android-test. The classes do not need to be
statically included because the classes will be provided by the
runtime, either from the default bootclasspath or from the
android.test.runner library that UiBenchJankTestsWear specifies in
its manifest.
* tests/perf/PerformanceAppTest/Android.mk
Replaced 'legacy-android-test' with 'android.test.base' in
LOCAL_JAVA_LIBRARIES because PerformanceAppTest's source depends on
its classes. The classes do not need to be statically included
because the classes will be provided by the runtime, either from
the default bootclasspath or from the android.test.runner library
that PerformanceAppTest specifies in its manifest.
* tests/perf/PowerPerfTest/Android.mk
Replaced 'legacy-android-test' with 'android.test.base' in
LOCAL_JAVA_LIBRARIES because PowerPerfTest's source depends on its
classes. The classes do not need to be statically included because
the classes will be provided by the runtime, either from the
default bootclasspath or from the android.test.runner library that
PowerPerfTest specifies in its manifest.
Bug: 30188076
Test: make checkbuild
Change-Id: I1b7ac1efae2ac420be49b112ee705b8138abcf7f
Loading
Please sign in to comment