diff options
| -rw-r--r-- | packages/SettingsProvider/test/Android.mk | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/AppLaunch/Android.mk | 4 | ||||
| -rw-r--r-- | tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk | 4 | ||||
| -rw-r--r-- | tests/Compatibility/Android.mk | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/packages/SettingsProvider/test/Android.mk b/packages/SettingsProvider/test/Android.mk index d039f033015c..2673f3d6de23 100644 --- a/packages/SettingsProvider/test/Android.mk +++ b/packages/SettingsProvider/test/Android.mk @@ -9,7 +9,9 @@ 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 legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test + +LOCAL_JAVA_LIBRARIES := legacy-android-test LOCAL_PACKAGE_NAME := SettingsProviderTest diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index d47a67c56317..01672324f6d1 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -31,7 +31,7 @@ LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.mock legacy-android-test LOCAL_PACKAGE_NAME := FrameworksServicesTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk index 9435893afc62..d01b1f96ee05 100644 --- a/tests/AppLaunch/Android.mk +++ b/tests/AppLaunch/Android.mk @@ -9,9 +9,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := AppLaunch LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := legacy-android-test -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test include $(BUILD_PACKAGE) diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk index 1f14f0324bc5..527d1bbfd886 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk @@ -24,8 +24,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 := guava junit legacy-android-test +LOCAL_JAVA_LIBRARIES := legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := guava junit LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/Compatibility/Android.mk b/tests/Compatibility/Android.mk index 99e84bd39832..feeae0216dc2 100644 --- a/tests/Compatibility/Android.mk +++ b/tests/Compatibility/Android.mk @@ -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 := legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := junit # Include all test java files. LOCAL_SRC_FILES := \ $(call all-java-files-under, src) |