Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3215c85d authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Moved c.a.i.u.Predicate[s] into legacy-test" 

am: e476a305

Change-Id: Ia0b3ebd30e045fe2b26fe9a78b2de665bf960b0c
parents 8d692eb8 e476a305

core/tests/utiltests/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ LOCAL_JNI_SHARED_LIBRARIES := libmemoryintarraytest libcutils libc++ 
LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    frameworks-base-testutils \

    mockito-target

    mockito-target \

    legacy-android-tests



LOCAL_JAVA_LIBRARIES := android.test.runner

legacy-test/Android.mk

+19 −2
Original line number Diff line number Diff line
@@ -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

# =================================================

core/java/com/android/internal/util/Predicates.java→legacy-test/src/com/android/internal/util/Predicates.java

+2 −0
Original line number Diff line number Diff line
@@ -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 {