diff options
39 files changed, 47 insertions, 18 deletions
diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index af2e25a99ad5..de46b8c21259 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk @@ -29,6 +29,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(uiautomator.core_src_files) LOCAL_MODULE := uiautomator.core LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test include $(BUILD_STATIC_JAVA_LIBRARY) ############################################### @@ -36,6 +37,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(uiautomator.core_src_files) LOCAL_JAVA_LIBRARIES := $(uiautomator.core_java_libraries) +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/core-src \ $(LOCAL_PATH)/testrunner-src diff --git a/core/tests/ConnectivityManagerTest/Android.mk b/core/tests/ConnectivityManagerTest/Android.mk index 56011f7293ea..39cf4a49ffbf 100644 --- a/core/tests/ConnectivityManagerTest/Android.mk +++ b/core/tests/ConnectivityManagerTest/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/core/tests/bandwidthtests/Android.mk b/core/tests/bandwidthtests/Android.mk index cb44721b7cec..2af92dfe6104 100644 --- a/core/tests/bandwidthtests/Android.mk +++ b/core/tests/bandwidthtests/Android.mk @@ -23,6 +23,7 @@ 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_PACKAGE_NAME := BandwidthTests include $(BUILD_PACKAGE) diff --git a/core/tests/bluetoothtests/Android.mk b/core/tests/bluetoothtests/Android.mk index 4a1d18cb5c05..f53419ab53cd 100644 --- a/core/tests/bluetoothtests/Android.mk +++ b/core/tests/bluetoothtests/Android.mk @@ -9,6 +9,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := BluetoothTests LOCAL_CERTIFICATE := platform diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk index 97e8b1ffbaea..47ee2cfe6e90 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests 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_PACKAGE_NAME := DownloadManagerTestApp diff --git a/core/tests/notificationtests/Android.mk b/core/tests/notificationtests/Android.mk index 702218c56a0e..0551eb6b75ad 100644 --- a/core/tests/notificationtests/Android.mk +++ b/core/tests/notificationtests/Android.mk @@ -12,6 +12,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := NotificationStressTests LOCAL_STATIC_JAVA_LIBRARIES := \ + junit \ + legacy-android-test \ ub-uiautomator include $(BUILD_PACKAGE) diff --git a/core/tests/utillib/Android.mk b/core/tests/utillib/Android.mk index 299ea5a2aeec..88112561f1d0 100644 --- a/core/tests/utillib/Android.mk +++ b/core/tests/utillib/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_MODULE := frameworks-core-util-lib +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/graphics/tests/graphicstests/Android.mk b/graphics/tests/graphicstests/Android.mk index 1845395a7790..8ea44bdb7966 100644 --- a/graphics/tests/graphicstests/Android.mk +++ b/graphics/tests/graphicstests/Android.mk @@ -8,6 +8,7 @@ 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_PACKAGE_NAME := FrameworksGraphicsTests include $(BUILD_PACKAGE) diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk index 35388d7d129e..a740b1342690 100644 --- a/keystore/tests/Android.mk +++ b/keystore/tests/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/media/mca/tests/Android.mk b/media/mca/tests/Android.mk index 2abd7f65e540..eb451f72e49e 100644 --- a/media/mca/tests/Android.mk +++ b/media/mca/tests/Android.mk @@ -5,6 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk index 308c6658b5d5..0d9f42b93007 100644 --- a/media/tests/MediaFrameworkTest/Android.mk +++ b/media/tests/MediaFrameworkTest/Android.mk @@ -10,7 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := \ mockito-target-minus-junit4 \ android-support-test \ - android-ex-camera2 + android-ex-camera2 \ + legacy-android-test LOCAL_PACKAGE_NAME := mediaframeworktest diff --git a/nfc-extras/Android.mk b/nfc-extras/Android.mk index 330e2d4ec17d..cd7a45b577de 100644 --- a/nfc-extras/Android.mk +++ b/nfc-extras/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test + LOCAL_MODULE:= com.android.nfc_extras include $(BUILD_JAVA_LIBRARY) diff --git a/packages/CarrierDefaultApp/tests/unit/Android.mk b/packages/CarrierDefaultApp/tests/unit/Android.mk index 092df50410b1..63bd0b13c61f 100644 --- a/packages/CarrierDefaultApp/tests/unit/Android.mk +++ b/packages/CarrierDefaultApp/tests/unit/Android.mk @@ -21,7 +21,7 @@ LOCAL_CERTIFICATE := platform 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. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/packages/MtpDocumentsProvider/tests/Android.mk b/packages/MtpDocumentsProvider/tests/Android.mk index 853837929eca..e50d6fb693c9 100644 --- a/packages/MtpDocumentsProvider/tests/Android.mk +++ b/packages/MtpDocumentsProvider/tests/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) 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_PACKAGE_NAME := MtpDocumentsProviderTests LOCAL_INSTRUMENTATION_FOR := MtpDocumentsProvider LOCAL_CERTIFICATE := media diff --git a/packages/SettingsProvider/Android.mk b/packages/SettingsProvider/Android.mk index 710214c33ebd..069e83a8d2d6 100644 --- a/packages/SettingsProvider/Android.mk +++ b/packages/SettingsProvider/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ src/com/android/providers/settings/EventLogTags.logtags LOCAL_JAVA_LIBRARIES := telephony-common ims-common +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := SettingsProvider LOCAL_CERTIFICATE := platform diff --git a/packages/SettingsProvider/test/Android.mk b/packages/SettingsProvider/test/Android.mk index 918410ea7277..d039f033015c 100644 --- a/packages/SettingsProvider/test/Android.mk +++ b/packages/SettingsProvider/test/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) \ ../src/com/android/providers/settings/SettingsState.java -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test LOCAL_PACKAGE_NAME := SettingsProviderTest @@ -17,4 +17,4 @@ LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform -include $(BUILD_PACKAGE)
\ No newline at end of file +include $(BUILD_PACKAGE) diff --git a/packages/Shell/tests/Android.mk b/packages/Shell/tests/Android.mk index 0424eb070474..acd552da6081 100644 --- a/packages/Shell/tests/Android.mk +++ b/packages/Shell/tests/Android.mk @@ -12,6 +12,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-target-minus-junit4 \ ub-uiautomator \ + junit \ + legacy-android-test \ LOCAL_PACKAGE_NAME := ShellTests LOCAL_INSTRUMENTATION_FOR := Shell diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index e96ea19f1236..c627e224dee8 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -46,7 +46,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ mockito-updated-target-minus-junit4 \ SystemUI-proto \ - SystemUI-tags + SystemUI-tags \ + legacy-android-test LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car diff --git a/packages/WAPPushManager/tests/Android.mk b/packages/WAPPushManager/tests/Android.mk index 7128b0ddf1bd..1dea798e83b2 100644 --- a/packages/WAPPushManager/tests/Android.mk +++ b/packages/WAPPushManager/tests/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/packages/WallpaperCropper/Android.mk b/packages/WallpaperCropper/Android.mk index 09b41fdd1262..d8fb7a4d3a2a 100644 --- a/packages/WallpaperCropper/Android.mk +++ b/packages/WallpaperCropper/Android.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) 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_CERTIFICATE := platform diff --git a/sax/tests/saxtests/Android.mk b/sax/tests/saxtests/Android.mk index 836711b13dde..d3fbd0569e78 100644 --- a/sax/tests/saxtests/Android.mk +++ b/sax/tests/saxtests/Android.mk @@ -8,6 +8,7 @@ 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_PACKAGE_NAME := FrameworksSaxTests include $(BUILD_PACKAGE) diff --git a/test-runner/Android.mk b/test-runner/Android.mk index 0e9a4854e2c9..3c36e429ef7f 100644 --- a/test-runner/Android.mk +++ b/test-runner/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) 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 diff --git a/test-runner/tests/Android.mk b/test-runner/tests/Android.mk index d1efe7b17e23..68fd6621718c 100644 --- a/test-runner/tests/Android.mk +++ b/test-runner/tests/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk index e6f6c394f42d..9435893afc62 100644 --- a/tests/AppLaunch/Android.mk +++ b/tests/AppLaunch/Android.mk @@ -11,7 +11,7 @@ LOCAL_PACKAGE_NAME := AppLaunch LOCAL_CERTIFICATE := platform 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) diff --git a/tests/BrowserPowerTest/Android.mk b/tests/BrowserPowerTest/Android.mk index f2c07b3fcd1f..59bc729a6280 100644 --- a/tests/BrowserPowerTest/Android.mk +++ b/tests/BrowserPowerTest/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk index 50926a6fcb84..1f14f0324bc5 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk @@ -25,13 +25,8 @@ LOCAL_PACKAGE_NAME := SmartCamera-tests LOCAL_SRC_FILES += $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner -#LOCAL_STATIC_JAVA_LIBRARIES := filterframework-test-lib -LOCAL_STATIC_JAVA_LIBRARIES += guava +LOCAL_STATIC_JAVA_LIBRARIES := guava junit legacy-android-test -#LOCAL_JAVA_LIBRARIES := filterframework-test-lib -LOCAL_STATIC_JAVA_LIBRARIES := guava - -LOCAL_STATIC_JAVA_LIBRARIES += LOCAL_PROGUARD_ENABLED := disabled LOCAL_INSTRUMENTATION_FOR := SmartCamera diff --git a/tests/CanvasCompare/Android.mk b/tests/CanvasCompare/Android.mk index 642c9e918336..90de503ebd81 100644 --- a/tests/CanvasCompare/Android.mk +++ b/tests/CanvasCompare/Android.mk @@ -24,5 +24,6 @@ LOCAL_PACKAGE_NAME := CanvasCompare LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test include $(BUILD_PACKAGE) diff --git a/tests/Compatibility/Android.mk b/tests/Compatibility/Android.mk index c2f89ddc7619..99e84bd39832 100644 --- a/tests/Compatibility/Android.mk +++ b/tests/Compatibility/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := \ $(call all-java-files-under, src) diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk index 5f3d0d9a33bc..c9f11615381f 100644 --- a/tests/CoreTests/android/Android.mk +++ b/tests/CoreTests/android/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := \ $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt org.apache.http.legacy +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := CoreTests diff --git a/tests/DataIdleTest/Android.mk b/tests/DataIdleTest/Android.mk index acb46c545cc5..4e15729221a9 100644 --- a/tests/DataIdleTest/Android.mk +++ b/tests/DataIdleTest/Android.mk @@ -21,6 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := DataIdleTest LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) # We need to sign it to get access to the network usage history. diff --git a/tests/FrameworkPerf/Android.mk b/tests/FrameworkPerf/Android.mk index 2eb52f0ecf81..d2ec75347531 100644 --- a/tests/FrameworkPerf/Android.mk +++ b/tests/FrameworkPerf/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FrameworkPerf LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_AAPT_FLAGS = -c 120dpi,240dpi,160dpi,161dpi,320dpi,nodpi diff --git a/tests/HierarchyViewerTest/Android.mk b/tests/HierarchyViewerTest/Android.mk index 07b90f0fa638..f8c865631f93 100644 --- a/tests/HierarchyViewerTest/Android.mk +++ b/tests/HierarchyViewerTest/Android.mk @@ -8,5 +8,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := HierarchyViewerTest LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test include $(BUILD_PACKAGE) diff --git a/tests/ImfTest/tests/Android.mk b/tests/ImfTest/tests/Android.mk index 0f1924cc3342..60424712d02c 100644 --- a/tests/ImfTest/tests/Android.mk +++ b/tests/ImfTest/tests/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := ImfTestTests diff --git a/tests/MemoryUsage/Android.mk b/tests/MemoryUsage/Android.mk index 0ab793b0e0c4..578e628987f1 100644 --- a/tests/MemoryUsage/Android.mk +++ b/tests/MemoryUsage/Android.mk @@ -10,8 +10,9 @@ LOCAL_PACKAGE_NAME := MemoryUsage LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test include $(BUILD_PACKAGE) # Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/NetworkSecurityConfigTest/Android.mk b/tests/NetworkSecurityConfigTest/Android.mk index a63162d9ba09..dd9ff11971eb 100644 --- a/tests/NetworkSecurityConfigTest/Android.mk +++ b/tests/NetworkSecurityConfigTest/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/SoundTriggerTests/Android.mk b/tests/SoundTriggerTests/Android.mk index e67134dd2806..359484ee63d7 100644 --- a/tests/SoundTriggerTests/Android.mk +++ b/tests/SoundTriggerTests/Android.mk @@ -27,7 +27,7 @@ else LOCAL_SRC_FILES := src/android/hardware/soundtrigger/SoundTriggerTest.java endif -LOCAL_STATIC_JAVA_LIBRARIES := mockito-target +LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := SoundTriggerTests diff --git a/tests/TtsTests/Android.mk b/tests/TtsTests/Android.mk index e049c908ebe7..ed63e1264d8b 100644 --- a/tests/TtsTests/Android.mk +++ b/tests/TtsTests/Android.mk @@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests 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_PACKAGE_NAME := TtsTests diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk index 31a0daffed3a..54688c891046 100644 --- a/tests/permission/Android.mk +++ b/tests/permission/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common +LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := FrameworkPermissionTests include $(BUILD_PACKAGE) diff --git a/tests/utils/testutils/Android.mk b/tests/utils/testutils/Android.mk index 392d39800218..43d1e37cafa3 100644 --- a/tests/utils/testutils/Android.mk +++ b/tests/utils/testutils/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ + legacy-android-test \ mockito-target-minus-junit4 LOCAL_JAVA_LIBRARIES := android.test.runner |