diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-18 07:34:00 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-18 07:34:00 +0000 |
| commit | bc7f430decab0bc34a533811efe457d4615f28aa (patch) | |
| tree | bc9f4f21c93e0021a266c3e2793c54e9b81c1b53 | |
| parent | 9be23d3c14274e24e39fcc3a3a570cff0516e91a (diff) | |
| parent | ee027a576ddebaf1ae739219be01b0240b15f80c (diff) | |
| download | TV-bc7f430decab0bc34a533811efe457d4615f28aa.tar.gz | |
release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650
Change-Id: Idfae16e60a819e2d4fd704becd19ed2f5a71cbe1
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | tests/func/Android.mk | 2 | ||||
| -rw-r--r-- | tests/jank/Android.mk | 2 | ||||
| -rw-r--r-- | tests/unit/Android.mk | 2 |
4 files changed, 7 insertions, 2 deletions
@@ -57,9 +57,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ icu4j-usbtuner \ lib-exoplayer \ tv-common \ - legacy-android-test \ - junit +LOCAL_JAVA_LIBRARIES := junit LOCAL_JAVACFLAGS := -Xlint:deprecation -Xlint:unchecked diff --git a/tests/func/Android.mk b/tests/func/Android.mk index e89ba25b..b0c5ad1c 100644 --- a/tests/func/Android.mk +++ b/tests/func/Android.mk @@ -14,6 +14,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ tv-test-common \ ub-uiautomator \ +LOCAL_JAVA_LIBRARIES := legacy-android-test + LOCAL_INSTRUMENTATION_FOR := LiveTv LOCAL_SDK_VERSION := current diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk index b71ea1b7..210a75ea 100644 --- a/tests/jank/Android.mk +++ b/tests/jank/Android.mk @@ -15,6 +15,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ ub-janktesthelper \ ub-uiautomator \ +LOCAL_JAVA_LIBRARIES := legacy-android-test + LOCAL_INSTRUMENTATION_FOR := LiveTv LOCAL_SDK_VERSION := current diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk index 7ed100d0..f53220de 100644 --- a/tests/unit/Android.mk +++ b/tests/unit/Android.mk @@ -12,6 +12,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ mockito-target \ tv-test-common \ +LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test + LOCAL_PACKAGE_NAME := TVUnitTests LOCAL_INSTRUMENTATION_FOR := LiveTv |