Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prepare for removal of legacy-test from default targets"

Browse Source 
am: c74ccf1588

Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
This commit is contained in:
Paul Duffin
2017-01-19 11:40:22 +00:00
committed by android-build-merger
parent c822d054a3 c74ccf1588
commit ab62fd67d8
42 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/uiautomator/library/Android.mk
View File

@@ -29,6 +29,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(uiautomator.core_src_files) LOCAL_SRC_FILES := $(uiautomator.core_src_files)
LOCAL_MODULE := uiautomator.core LOCAL_MODULE := uiautomator.core
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
############################################### ###############################################

1
core/tests/ConnectivityManagerTest/Android.mk
View File

@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

1
core/tests/bandwidthtests/Android.mk
View File

@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, src) $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := BandwidthTests LOCAL_PACKAGE_NAME := BandwidthTests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
core/tests/bluetoothtests/Android.mk
View File

@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, src) $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := BluetoothTests LOCAL_PACKAGE_NAME := BluetoothTests
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

2
core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
View File

@@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit legacy-android-test
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_PACKAGE_NAME := DownloadManagerTestApp LOCAL_PACKAGE_NAME := DownloadManagerTestApp

2
core/tests/notificationtests/Android.mk
View File

@@ -12,6 +12,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_PACKAGE_NAME := NotificationStressTests LOCAL_PACKAGE_NAME := NotificationStressTests
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
junit \
legacy-android-test \
ub-uiautomator ub-uiautomator
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
core/tests/utillib/Android.mk
View File

@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_MODULE := frameworks-core-util-lib LOCAL_MODULE := frameworks-core-util-lib
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)

1
graphics/tests/graphicstests/Android.mk
View File

@@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := FrameworksGraphicsTests LOCAL_PACKAGE_NAME := FrameworksGraphicsTests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
keystore/tests/Android.mk
View File

@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

1
media/mca/tests/Android.mk
View File

@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

3
media/tests/MediaFrameworkTest/Android.mk
View File

@@ -10,7 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := easymocklib \ LOCAL_STATIC_JAVA_LIBRARIES := easymocklib \
mockito-target \ mockito-target \
android-support-test \ android-support-test \
android-ex-camera2 android-ex-camera2 \
legacy-android-test
LOCAL_PACKAGE_NAME := mediaframeworktest LOCAL_PACKAGE_NAME := mediaframeworktest

2
nfc-extras/Android.mk
View File

@@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_MODULE:= com.android.nfc_extras LOCAL_MODULE:= com.android.nfc_extras
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)

2
packages/CarrierDefaultApp/tests/unit/Android.mk
View File

@@ -21,7 +21,7 @@ LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

5
packages/DocumentsUI/app-perf-tests/Android.mk
View File

@@ -7,7 +7,10 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target \
ub-uiautomator \
legacy-android-test
LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests
LOCAL_INSTRUMENTATION_FOR := DocumentsUI LOCAL_INSTRUMENTATION_FOR := DocumentsUI

6
packages/DocumentsUI/perf-tests/Android.mk
View File

@@ -11,7 +11,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
../tests/src/com/android/documentsui/StubProvider.java ../tests/src/com/android/documentsui/StubProvider.java
LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator ub-janktesthelper LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target \
ub-uiautomator \
ub-janktesthelper \
legacy-android-test
LOCAL_PACKAGE_NAME := DocumentsUIPerfTests LOCAL_PACKAGE_NAME := DocumentsUIPerfTests
LOCAL_INSTRUMENTATION_FOR := DocumentsUI LOCAL_INSTRUMENTATION_FOR := DocumentsUI

6
packages/DocumentsUI/tests/Android.mk
View File

@@ -8,7 +8,11 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator android-support-test LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target \
ub-uiautomator \
android-support-test \
legacy-android-test
LOCAL_PACKAGE_NAME := DocumentsUITests LOCAL_PACKAGE_NAME := DocumentsUITests
LOCAL_INSTRUMENTATION_FOR := DocumentsUI LOCAL_INSTRUMENTATION_FOR := DocumentsUI

1
packages/MtpDocumentsProvider/tests/Android.mk
View File

@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := MtpDocumentsProviderTests LOCAL_PACKAGE_NAME := MtpDocumentsProviderTests
LOCAL_INSTRUMENTATION_FOR := MtpDocumentsProvider LOCAL_INSTRUMENTATION_FOR := MtpDocumentsProvider
LOCAL_CERTIFICATE := media LOCAL_CERTIFICATE := media

1
packages/SettingsProvider/Android.mk
View File

@@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
src/com/android/providers/settings/EventLogTags.logtags src/com/android/providers/settings/EventLogTags.logtags
LOCAL_JAVA_LIBRARIES := telephony-common ims-common LOCAL_JAVA_LIBRARIES := telephony-common ims-common
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := SettingsProvider LOCAL_PACKAGE_NAME := SettingsProvider
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

4
packages/SettingsProvider/test/Android.mk
View File

@@ -7,10 +7,12 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) \ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
../src/com/android/providers/settings/SettingsState.java ../src/com/android/providers/settings/SettingsState.java
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := SettingsProviderTest LOCAL_PACKAGE_NAME := SettingsProviderTest
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
packages/Shell/tests/Android.mk
View File

@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator junit legacy-android-test
LOCAL_PACKAGE_NAME := ShellTests LOCAL_PACKAGE_NAME := ShellTests
LOCAL_INSTRUMENTATION_FOR := Shell LOCAL_INSTRUMENTATION_FOR := Shell

3
packages/SystemUI/tests/Android.mk
View File

@@ -52,7 +52,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v7-appcompat \ android-support-v7-appcompat \
android-support-v14-preference \ android-support-v14-preference \
android-support-v17-leanback \ android-support-v17-leanback \
SystemUI-proto-tags SystemUI-proto-tags \
legacy-android-test
# sign this with platform cert, so this test is allowed to inject key events into # sign this with platform cert, so this test is allowed to inject key events into
# UI it doesn't own. This is necessary to allow screenshots to be taken # UI it doesn't own. This is necessary to allow screenshots to be taken

1
packages/WAPPushManager/tests/Android.mk
View File

@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
packages/WallpaperCropper/Android.mk
View File

@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 junit
LOCAL_PACKAGE_NAME := WallpaperCropper LOCAL_PACKAGE_NAME := WallpaperCropper
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

1
sax/tests/saxtests/Android.mk
View File

@@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := FrameworksSaxTests LOCAL_PACKAGE_NAME := FrameworksSaxTests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
test-runner/Android.mk
View File

@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := core-oj core-libart junit framework LOCAL_JAVA_LIBRARIES := core-oj core-libart framework legacy-test
LOCAL_MODULE:= android.test.runner LOCAL_MODULE:= android.test.runner

1
test-runner/tests/Android.mk
View File

@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
tests/AppLaunch/Android.mk
View File

@@ -11,7 +11,7 @@ LOCAL_PACKAGE_NAME := AppLaunch
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
tests/BrowserPowerTest/Android.mk
View File

@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

7
tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
View File

@@ -25,13 +25,8 @@ LOCAL_PACKAGE_NAME := SmartCamera-tests
LOCAL_SRC_FILES += $(call all-java-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
#LOCAL_STATIC_JAVA_LIBRARIES := filterframework-test-lib LOCAL_STATIC_JAVA_LIBRARIES := guava junit legacy-android-test
LOCAL_STATIC_JAVA_LIBRARIES += guava
#LOCAL_JAVA_LIBRARIES := filterframework-test-lib
LOCAL_STATIC_JAVA_LIBRARIES := guava
LOCAL_STATIC_JAVA_LIBRARIES +=
LOCAL_PROGUARD_ENABLED := disabled LOCAL_PROGUARD_ENABLED := disabled
LOCAL_INSTRUMENTATION_FOR := SmartCamera LOCAL_INSTRUMENTATION_FOR := SmartCamera

1
tests/CanvasCompare/Android.mk
View File

@@ -24,5 +24,6 @@ LOCAL_PACKAGE_NAME := CanvasCompare
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
tests/Compatibility/Android.mk
View File

@@ -19,6 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(call all-java-files-under, src) $(call all-java-files-under, src)

1
tests/CoreTests/android/Android.mk
View File

@@ -7,6 +7,7 @@ LOCAL_SRC_FILES := \
$(call all-subdir-java-files) $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt org.apache.http.legacy LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt org.apache.http.legacy
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := CoreTests LOCAL_PACKAGE_NAME := CoreTests

1
tests/DataIdleTest/Android.mk
View File

@@ -21,6 +21,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := DataIdleTest LOCAL_PACKAGE_NAME := DataIdleTest
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
# We need to sign it to get access to the network usage history. # We need to sign it to get access to the network usage history.

1
tests/FrameworkPerf/Android.mk
View File

@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := FrameworkPerf LOCAL_PACKAGE_NAME := FrameworkPerf
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_AAPT_FLAGS = -c 120dpi,240dpi,160dpi,161dpi,320dpi,nodpi LOCAL_AAPT_FLAGS = -c 120dpi,240dpi,160dpi,161dpi,320dpi,nodpi

1
tests/HierarchyViewerTest/Android.mk
View File

@@ -8,5 +8,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := HierarchyViewerTest LOCAL_PACKAGE_NAME := HierarchyViewerTest
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
tests/ImfTest/tests/Android.mk
View File

@@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := ImfTestTests LOCAL_PACKAGE_NAME := ImfTestTests

3
tests/MemoryUsage/Android.mk
View File

@@ -10,8 +10,9 @@ LOCAL_PACKAGE_NAME := MemoryUsage
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
# Use the following include to make our test apk. # Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))

1
tests/NetworkSecurityConfigTest/Android.mk
View File

@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
tests/SoundTriggerTests/Android.mk
View File

@@ -27,7 +27,7 @@ else
LOCAL_SRC_FILES := src/android/hardware/soundtrigger/SoundTriggerTest.java LOCAL_SRC_FILES := src/android/hardware/soundtrigger/SoundTriggerTest.java
endif endif
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_PACKAGE_NAME := SoundTriggerTests LOCAL_PACKAGE_NAME := SoundTriggerTests

2
tests/TtsTests/Android.mk
View File

@@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_STATIC_JAVA_LIBRARIES := littlemock LOCAL_STATIC_JAVA_LIBRARIES := littlemock junit legacy-android-test
LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_PACKAGE_NAME := TtsTests LOCAL_PACKAGE_NAME := TtsTests

1
tests/permission/Android.mk
View File

@@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_PACKAGE_NAME := FrameworkPermissionTests LOCAL_PACKAGE_NAME := FrameworkPermissionTests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
tests/utils/testutils/Android.mk
View File

@@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java)
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
legacy-android-test \
mockito-target mockito-target
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)