diff options
| author | Yuntao Xu <yuntaoxu@google.com> | 2021-05-18 18:45:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-18 18:45:41 +0000 |
| commit | cd5e9c06e460ecfa1f0a5eff80c0cc7c0329002a (patch) | |
| tree | f30f5323d262b1eef3ee5e498320b028eedb215d | |
| parent | 5ef81ae71f2c410c1be669ecf3f25397585b809c (diff) | |
| parent | 95a3208d0607944c65fa13969d265248fb8959d4 (diff) | |
| download | TV-cd5e9c06e460ecfa1f0a5eff80c0cc7c0329002a.tar.gz | |
Merge "Convert jank/Android.mk to Android.bp" am: 9522794f50 am: 95a3208d06
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1690699
Change-Id: I02a9f452228a9d44bbf06353e7436fcea385da24
| -rw-r--r-- | tests/jank/Android.bp | 22 | ||||
| -rw-r--r-- | tests/jank/Android.mk | 27 |
2 files changed, 22 insertions, 27 deletions
diff --git a/tests/jank/Android.bp b/tests/jank/Android.bp new file mode 100644 index 00000000..1cea734b --- /dev/null +++ b/tests/jank/Android.bp @@ -0,0 +1,22 @@ +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +android_test { + name: "TVJankTests", + // Include all test java files. + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.runner", + "tv-test-common", + "ub-janktesthelper", + "ub-uiautomator", + ], + libs: ["android.test.base.stubs"], + instrumentation_for: "LiveTv", + sdk_version: "system_current", + optimize: { + enabled: false, + }, +} diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk deleted file mode 100644 index 9c52840d..00000000 --- a/tests/jank/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := TVJankTests -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.runner \ - tv-test-common \ - ub-janktesthelper \ - ub-uiautomator \ - -LOCAL_JAVA_LIBRARIES := android.test.base.stubs - -LOCAL_INSTRUMENTATION_FOR := LiveTv - -LOCAL_SDK_VERSION := system_current -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) |