1abbb6a6fd
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.
* test-runner/tests/Android.mk
Added 'android.test.base' and 'android.test.mock' to
LOCAL_JAVA_LIBRARIES because FrameworkTestRunnerTests'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
FrameworkTestRunnerTests results in duplicate classes which leads
to build time and compile time issues.
Bug: 30188076
Test: make checkbuild
Change-Id: I52a91fe4f6016de8edf4753fbd2bc4d2e4c9f317
38 lines
1.3 KiB
Makefile
38 lines
1.3 KiB
Makefile
# Copyright 2010, The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
LOCAL_PATH:= $(call my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
# We only want this apk build for tests.
|
|
#
|
|
# Run the tests using the following commands:
|
|
# adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworkTestRunnerTests/FrameworkTestRunnerTests.apk
|
|
# adb shell am instrument \
|
|
-e notAnnotation android.test.suitebuilder.examples.error.RunAsPartOfSeparateTest \
|
|
-w com.android.frameworks.testrunner.tests/android.test.InstrumentationTestRunner
|
|
#
|
|
LOCAL_MODULE_TAGS := tests
|
|
|
|
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
|
|
LOCAL_STATIC_JAVA_LIBRARIES := junit
|
|
|
|
# Include all test java files.
|
|
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
|
|
|
LOCAL_PACKAGE_NAME := FrameworkTestRunnerTests
|
|
|
|
include $(BUILD_PACKAGE)
|
|
|