diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-07-10 15:16:07 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-07-17 15:25:04 +0100 |
| commit | 855d702cb78f81abbf2a541f01afeacf280d5621 (patch) | |
| tree | 0091fe94a6818ae7dffd4d6d01921cd5a651a4bf /test-runner | |
| parent | 07001e8313f56174734e216360ead3c7dce8d982 (diff) | |
Separate android.test.mock classes from android.test.runner
The android.test.runner library contained classes in the
android.test.mock. Those classes have been extracted into a separate
android.test.mock library but are still part of the android.test.runner
library. This change removes them from the android.test.runner library.
The PackageParser change ensures that applications which specify
<uses-library android:name="android.test.runner"/> still see the same
set of classes at runtime as they did before this change.
The logic for updating the Package to maintain backwards compatibility
was extracted into its own class for a number of reasons:
* PackageParser is already huge.
* It is easier to test in separate class.
* It reduces potential for conflicts.
Bug: 30188076
Test: cts/tests/signature/runSignatureTests.sh CtsAndroidTestRunnerCurrentApiSignatureTestCases
Change-Id: I19042b3f9ffff8bf0f8437db7bb8341c703e4244
Remove android.test.mock classes from android.test.runner
Bug: 30188076
Test: cts/tests/signature/runSignatureTests.sh CtsAndroidTestRunnerCurrentApiSignatureTestCases
Change-Id: I8ddbdb0bda7bef8858202bc085881af14d7f0c92
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 9053b23cfe9a..3c3718adff0e 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -22,9 +22,15 @@ android_test_mock_source_files := $(call all-java-files-under, src/android/test/ # ===================================== include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := \ + $(filter-out $(android_test_mock_source_files), $(call all-java-files-under, src)) -LOCAL_JAVA_LIBRARIES := core-oj core-libart framework legacy-test +LOCAL_JAVA_LIBRARIES := \ + core-oj \ + core-libart \ + framework \ + legacy-test \ + android.test.mock \ LOCAL_MODULE:= android.test.runner |