diff options
| author | 2017-01-18 11:39:39 +0000 | |
|---|---|---|
| committer | 2017-01-18 11:39:39 +0000 | |
| commit | 93a897b3db37904c422ca92ca07263ab832efd2d (patch) | |
| tree | e484f5d23367f1e331bf3205c30edfe5fb587270 | |
| parent | 5db17efcf60dfabec46cf1cd774a331b934fd21d (diff) | |
| parent | 2ac0e2a186e35e3fd4ae04ece8126552fd9d6270 (diff) | |
Merge "Add legacy-android-test target containing android.test classes" am: c20518139a am: 78af448c30
am: 2ac0e2a186
Change-Id: I965734e5064fccf08ae676047078632e7a95f3c7
| -rw-r--r-- | legacy-test/Android.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 5e72a0d541cb..0a814f39b637 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -18,7 +18,8 @@ LOCAL_PATH:= $(call my-dir) # Build the legacy-test library # ============================= -# This contains the junit.framework classes that were in Android API level 25. +# This contains the junit.framework and android.test classes that were in +# Android API level 25. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) @@ -28,6 +29,18 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart framework include $(BUILD_JAVA_LIBRARY) +# Build the legacy-android-test library +# ============================= +# This contains the android.test classes that were in Android API level 25. +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(call all-java-files-under, src/android) +LOCAL_MODULE := legacy-android-test +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit + +include $(BUILD_STATIC_JAVA_LIBRARY) + ifeq ($(HOST_OS),linux) # Build the legacy-performance-test-hostdex library # ================================================= |