From 2ccdf50ae29997216debf61374e7367bbe6bec82 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 5 Dec 2017 18:36:57 +0000 Subject: [PATCH] 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. * tests/Android.mk Replaced 'legacy-android-test' with 'android.test.runner.stubs' in LOCAL_JAVA_LIBRARIES because LatinIMETests'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 LatinIMETests specifies in its manifest. Bug: 30188076 Test: make checkbuild Change-Id: I3c70889b35d402626f79c986771b9c2ea8823b8a --- tests/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Android.mk b/tests/Android.mk index 5c2c2c76e..be3f5aac7 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -28,7 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-target-minus-junit4 -LOCAL_JAVA_LIBRARIES := android.test.mock.stubs legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.mock.stubs android.test.runner.stubs # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src)