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:08:16 +0000 |
| commit | 6a73bd65ca10d7b715aef18f9f7db1f233bd78ac (patch) | |
| tree | 5f24be7e52f331847af1914d97a9a55f8d9da590 /perf-tests | |
| parent | aec4050127a6958610f74f7d2dc80d6cbabae57d (diff) | |
| download | platform_packages_apps_DocumentsUI-6a73bd65ca10d7b715aef18f9f7db1f233bd78ac.tar.gz platform_packages_apps_DocumentsUI-6a73bd65ca10d7b715aef18f9f7db1f233bd78ac.tar.bz2 platform_packages_apps_DocumentsUI-6a73bd65ca10d7b715aef18f9f7db1f233bd78ac.zip | |
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.
* app-perf-tests/Android.mk
Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
DocumentsUIAppPerfTests'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 DocumentsUIAppPerfTests
results in duplicate classes which leads to build time and compile
time issues.
* perf-tests/Android.mk
Added 'android.test.base' and 'android.test.mock' to
LOCAL_JAVA_LIBRARIES because DocumentsUIPerfTests's source depends
on their 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 DocumentsUIPerfTests
results in duplicate classes which leads to build time and compile
time issues.
* tests/Android.mk
Added 'android.test.base' and 'android.test.mock' to
LOCAL_JAVA_LIBRARIES because DocumentsUITests's source depends on
their 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 DocumentsUITests
results in duplicate classes which leads to build time and compile
time issues.
Bug: 30188076
Test: make checkbuild
Change-Id: Ic14e6ba4f57a82554eb8fae6038fabc8e1f19836
Diffstat (limited to 'perf-tests')
| -rw-r--r-- | perf-tests/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perf-tests/Android.mk b/perf-tests/Android.mk index ac5537a2b..0f4696631 100644 --- a/perf-tests/Android.mk +++ b/perf-tests/Android.mk @@ -8,14 +8,13 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-java-files-under, ../tests/common/com/android/documentsui) \ ../tests/functional/com/android/documentsui/ActivityTest.java -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES := \ mockito-target \ ub-uiautomator \ ub-janktesthelper \ - espresso-core \ - legacy-android-test + espresso-core LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := DocumentsUIPerfTests |