diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-06-15 07:38:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-15 07:38:37 +0000 |
| commit | 33704b7c1e0751aceb420ecebfa64a0dfb5e7974 (patch) | |
| tree | b6a4696e3a259d1dcebfa3c52080dc5096c10d6b | |
| parent | 5415d6e49a996ef00fda10adfaacc60f05ee74c7 (diff) | |
| parent | 7416628255cd3c95b6ffecd331fbb0add9c1eea9 (diff) | |
| download | TV-33704b7c1e0751aceb420ecebfa64a0dfb5e7974.tar.gz | |
Fix dependencies of packages that target earlier releases
am: 7416628255
Change-Id: I12b7e209f7697fde8f3641796540fa8f6ce25be1
| -rw-r--r-- | Android.mk | 2 | ||||
| -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, 8 insertions, 0 deletions
@@ -62,6 +62,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ +LOCAL_JAVA_LIBRARIES := junit + LOCAL_JAVACFLAGS := -Xlint:deprecation -Xlint:unchecked LOCAL_AAPT_FLAGS := --auto-add-overlay \ 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 |