diff options
| author | Yuntao Xu <yuntaoxu@google.com> | 2021-06-28 22:01:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-28 22:01:44 +0000 |
| commit | e365ae93b18931a44014478c1ca30356de934d3b (patch) | |
| tree | 61f5a498f2b80396586e59d9ec78e2ba73da2434 | |
| parent | 8ab3b76c48904dde6f9725c8be3801596c0449b1 (diff) | |
| parent | c1a3a27689f20a6ed5f024d6ce131b8dc29aeaf8 (diff) | |
| download | platform_packages_services_Mtp-android-s-beta-5.tar.gz platform_packages_services_Mtp-android-s-beta-5.tar.bz2 platform_packages_services_Mtp-android-s-beta-5.zip | |
Merge "Convert tests/Android.mk to Android.bp"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4
| -rw-r--r-- | tests/Android.bp | 19 | ||||
| -rw-r--r-- | tests/Android.mk | 16 |
2 files changed, 19 insertions, 16 deletions
diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..6278272 --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,19 @@ +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +android_test { + name: "MtpServiceTests", + srcs: ["src/**/*.java"], + libs: [ + "android.test.runner", + "android.test.base", + "android.test.mock", + ], + static_libs: ["junit"], + platform_apis: true, + instrumentation_for: "MtpService", + certificate: "media", + test_suites: ["device-tests"], +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index b8103c9..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock -LOCAL_STATIC_JAVA_LIBRARIES := junit -LOCAL_PACKAGE_NAME := MtpServiceTests -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_INSTRUMENTATION_FOR := MtpService -LOCAL_CERTIFICATE := media -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) |