diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-12-08 00:02:42 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-12-08 00:07:23 +0000 |
| commit | 5151af823c9c03bedd30b41caaa01e53e3324c76 (patch) | |
| tree | d6f36e979eb12b932b5d8196d49583601982fcc1 | |
| parent | 3f01563afad6b3d2f0546a6260ef958a8173deb6 (diff) | |
| download | calendar-5151af823c9c03bedd30b41caaa01e53e3324c76.tar.gz | |
Stop statically including legacy-android-test
Statically including legacy-android-test leads to duplicate classes
which causes build time problems (with Proguard) and runtime problems on
older SDK versions. This change:
* Stops statically including legacy-android-test.
* Adds compile time dependencies on andoid.test.base, android.test.mock
and android.test.runner where necessary.
* Adds <uses-library android:name="android.test.runner"/> to any
affected package to ensure that the classes that were included by
legacy-android-test are still available at runtime. That also adds a
dependency on android.test.base and android.test.mock.
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
Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
CalendarCommonTests's source depends on its classes and because of
these changes they are no longer present on the compilation path.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because statically including the classes in CalendarCommonTests
results in duplicate classes which leads to build time and compile
time issues.
Bug: 30188076
Test: make checkbuild
Change-Id: Iadc6b967caaf8d5ce5b8a348ad33e1407da8470f
| -rw-r--r-- | tests/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 7a288ac..f35756f 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := CalendarCommonTests LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit include $(BUILD_PACKAGE) |