diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-05-15 10:44:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-15 10:44:55 +0000 |
| commit | e5573b54cb87bd9f693cb9de649c01c57804911b (patch) | |
| tree | b45ea2490bc3b2bde85ff1ebd5687f67cdbca7fb | |
| parent | d7ad0b7a1cd8ad0510fdb13af243166fba26e62e (diff) | |
| parent | f71d5b5b18eb0b8c0b383b697bc3d507d65a5c7f (diff) | |
Merge "Moved c.a.i.u.Predicate[s] into legacy-test" into oc-dev-plus-aosp
| -rw-r--r-- | core/tests/utiltests/Android.mk | 4 | ||||
| -rw-r--r-- | legacy-test/Android.mk | 21 | ||||
| -rw-r--r-- | legacy-test/src/com/android/internal/util/Predicate.java (renamed from core/java/com/android/internal/util/Predicate.java) | 0 | ||||
| -rw-r--r-- | legacy-test/src/com/android/internal/util/Predicates.java (renamed from core/java/com/android/internal/util/Predicates.java) | 2 | ||||
| -rw-r--r-- | legacy-test/tests/com/android/internal/util/PredicatesTest.java (renamed from core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java) | 0 |
5 files changed, 24 insertions, 3 deletions
diff --git a/core/tests/utiltests/Android.mk b/core/tests/utiltests/Android.mk index a4b09166bb3b..f2e02e332bfc 100644 --- a/core/tests/utiltests/Android.mk +++ b/core/tests/utiltests/Android.mk @@ -17,7 +17,8 @@ LOCAL_JNI_SHARED_LIBRARIES := libmemoryintarraytest libcutils libc++ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ frameworks-base-testutils \ - mockito-target-minus-junit4 + mockito-target-minus-junit4 \ + legacy-android-tests LOCAL_JAVA_LIBRARIES := android.test.runner @@ -28,3 +29,4 @@ LOCAL_CERTIFICATE := platform LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) + diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 0835cadbe698..8efda2ad0c20 100644 --- a/legacy-test/Android.mk +++ b/legacy-test/Android.mk @@ -20,9 +20,11 @@ LOCAL_PATH:= $(call my-dir) # ============================= # This contains the junit.framework and android.test classes that were in # Android API level 25 excluding those from android.test.runner. +# Also contains the com.android.internal.util.Predicate[s] classes. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) + LOCAL_MODULE := legacy-test LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj core-libart framework @@ -30,20 +32,35 @@ 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, # including those from android.test.runner. +# Also contains the com.android.internal.util.Predicate[s] classes. include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(call all-java-files-under, src/android) \ - $(call all-java-files-under, ../test-runner/src/android) + $(call all-java-files-under, ../test-runner/src/android) \ + $(call all-java-files-under, src/com) LOCAL_MODULE := legacy-android-test LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit include $(BUILD_STATIC_JAVA_LIBRARY) +# Build the legacy-android-tests library +# ====================================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(call all-java-files-under, tests) +LOCAL_MODULE := legacy-android-tests +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj core-libart framework junit +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test + +include $(BUILD_STATIC_JAVA_LIBRARY) + ifeq ($(HOST_OS),linux) # Build the legacy-performance-test-hostdex library # ================================================= diff --git a/core/java/com/android/internal/util/Predicate.java b/legacy-test/src/com/android/internal/util/Predicate.java index 1b5eaff67b87..1b5eaff67b87 100644 --- a/core/java/com/android/internal/util/Predicate.java +++ b/legacy-test/src/com/android/internal/util/Predicate.java diff --git a/core/java/com/android/internal/util/Predicates.java b/legacy-test/src/com/android/internal/util/Predicates.java index c006564f129a..fe1ff1529138 100644 --- a/core/java/com/android/internal/util/Predicates.java +++ b/legacy-test/src/com/android/internal/util/Predicates.java @@ -21,6 +21,8 @@ import java.util.Arrays; /** * Predicates contains static methods for creating the standard set of * {@code Predicate} objects. + * + * @hide */ public class Predicates { diff --git a/core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java b/legacy-test/tests/com/android/internal/util/PredicatesTest.java index c46ff051dd33..c46ff051dd33 100644 --- a/core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java +++ b/legacy-test/tests/com/android/internal/util/PredicatesTest.java |