Commit 6a73bd65 authored Dec 08, 2017 by Paul Duffin

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

parent aec40501

app-perf-tests/Android.mk

+2 −3

Original line number	Diff line number	Diff line
		@@ -6,12 +6,11 @@ LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := $(call all-java-files-under, src) \

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
		LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
		LOCAL_STATIC_JAVA_LIBRARIES := \
		mockito-target \
		ub-uiautomator \
		legacy-android-test
		ub-uiautomator

		LOCAL_USE_AAPT2 := true
		LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests

perf-tests/Android.mk

+2 −3

Original line number	Diff line number	Diff line
		@@ -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

tests/Android.mk

+2 −3

Original line number	Diff line number	Diff line
		@@ -12,13 +12,12 @@ LOCAL_SRC_FILES := $(call all-java-files-under, common) \
		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
		LOCAL_AAPT_FLAGS += -0 .zip

		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
		LOCAL_STATIC_JAVA_LIBRARIES := \
		mockito-target \
		ub-uiautomator \
		espresso-core \
		guava \
		legacy-android-test
		guava
		LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
		LOCAL_PACKAGE_NAME := DocumentsUITests
		LOCAL_COMPATIBILITY_SUITE := device-tests