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

Commit 57e4f25f authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge "Stop statically including legacy-android-test"

parents 23627fbf b866307f

apct-tests/perftests/core/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ LOCAL_SRC_FILES := \ 
LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    apct-perftests-utils \

    guava \

    legacy-android-test

    guava



LOCAL_JAVA_LIBRARIES := android.test.base



LOCAL_PACKAGE_NAME := CorePerfTests

core/tests/ConnectivityManagerTest/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ include $(CLEAR_VARS) 
# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_STATIC_JAVA_LIBRARIES := junit



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)

core/tests/bandwidthtests/Android.mk

+6 −2
Original line number Diff line number Diff line
@@ -22,8 +22,12 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := \

	$(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy

LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test

LOCAL_JAVA_LIBRARIES := \

    android.test.runner \

    org.apache.http.legacy \

    android.test.base \



LOCAL_STATIC_JAVA_LIBRARIES := junit

LOCAL_PACKAGE_NAME := BandwidthTests



include $(BUILD_PACKAGE)

core/tests/bluetoothtests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := \

	$(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_STATIC_JAVA_LIBRARIES := junit

LOCAL_PACKAGE_NAME := BluetoothTests

LOCAL_CERTIFICATE := platform

core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit legacy-android-test

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base



LOCAL_PACKAGE_NAME := DownloadManagerTestApp