2baf72190c
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/unit/Android.mk
Added 'android.test.base' and 'android.test.mock' to
LOCAL_JAVA_LIBRARIES because SettingsUnitTests'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 SettingsUnitTests
results in duplicate classes which leads to build time and compile
time issues.
Bug: 30188076
Test: make checkbuild
Change-Id: I191a72e50017213df6ad04f32aa660e8028720e2
35 lines
769 B
Makefile
35 lines
769 B
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
# We only want this apk build for tests.
|
|
LOCAL_MODULE_TAGS := tests
|
|
LOCAL_CERTIFICATE := platform
|
|
|
|
LOCAL_JAVA_LIBRARIES := \
|
|
android.test.runner \
|
|
telephony-common \
|
|
ims-common \
|
|
android.test.base \
|
|
android.test.mock \
|
|
|
|
|
|
LOCAL_STATIC_JAVA_LIBRARIES := \
|
|
android-support-test \
|
|
espresso-core \
|
|
espresso-contrib-nodep \
|
|
espresso-intents-nodep \
|
|
mockito-target-minus-junit4 \
|
|
platform-test-annotations \
|
|
truth-prebuilt \
|
|
ub-uiautomator
|
|
|
|
# Include all test java files.
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_PACKAGE_NAME := SettingsUnitTests
|
|
LOCAL_COMPATIBILITY_SUITE := device-tests
|
|
|
|
LOCAL_INSTRUMENTATION_FOR := Settings
|
|
|
|
include $(BUILD_PACKAGE)
|