diff options
| author | 2017-05-02 13:13:13 +0100 | |
|---|---|---|
| committer | 2017-05-09 15:10:03 +0100 | |
| commit | 4e0c19048d98f3057e5f4d20a2afd8a403087c30 (patch) | |
| tree | a9a59cb38b91e1c49d7fd0b9d0020992bc973d30 /legacy-test | |
| parent | c3d41d50933c69faf0b00540f128b0d130b4d1e8 (diff) | |
Statically include android.test.runner classes in legacy-android-test
In preparation for removing junit and android.test classes from
the Android API this change adds the android.test classes that are in
the android.test.runner library into legacy-android-test so that they
can be statically included into the application.
The junit.... classes from android.test.runner can already be
statically included from the junit library.
Bug: 30188076
Test: make checkbuild
Change-Id: Id8d32da9e46f0d9142b60ef28998b40e8d237b32
Diffstat (limited to 'legacy-test')
| -rw-r--r-- | legacy-test/Android.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 05fec5ee603f..0835cadbe698 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -19,7 +19,7 @@ LOCAL_PATH:= $(call my-dir) # Build the legacy-test library # ============================= # This contains the junit.framework and android.test classes that were in -# Android API level 25. +# Android API level 25 excluding those from android.test.runner. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) @@ -31,10 +31,13 @@ include $(BUILD_JAVA_LIBRARY) # Build the legacy-android-test library # ============================= -# This contains the android.test classes that were in Android API level 25. +# This contains the android.test classes that were in Android API level 25, +# including those from android.test.runner. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src/android) +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src/android) \ + $(call all-java-files-under, ../test-runner/src/android) LOCAL_MODULE := legacy-android-test LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit |