diff options
| author | 2017-05-10 11:18:42 +0000 | |
|---|---|---|
| committer | 2017-05-10 11:18:43 +0000 | |
| commit | 9588b607f048d0f513d674e90f9d0823928d1d26 (patch) | |
| tree | a2a1644ab0602045bd8664a294d99e4a48de7e3b | |
| parent | 16832244164726c847f0118fefd3e57a04e01af1 (diff) | |
| parent | 4e0c19048d98f3057e5f4d20a2afd8a403087c30 (diff) | |
Merge "Statically include android.test.runner classes in legacy-android-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 |