summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-06-13 12:28:59 +0100
committerAdrian DC <radian.dc@gmail.com>2017-08-31 10:13:08 +0200
commit840f2db8c1c00208fb660f864d0b58b55e43fcfe (patch)
tree0d108ce0439d5b6bf06581c0bf96d473f5f7a1f4
parent943d43e8b75a26667b7a4346d34ca7d46f03e93b (diff)
downloadandroid_packages_apps_Eleven-lineage-15.0.tar.gz
android_packages_apps_Eleven-lineage-15.0.tar.bz2
android_packages_apps_Eleven-lineage-15.0.zip
Fix dependencies of packages that target earlier releaseslineage-15.0
A previous change added legacy-android-test as a static dependency to all packages that build against the current, test_current or system_current and failed to compile when the junit and android.test classes were removed from the API. Unfortunately, those changes did not take into account that some of those packages target earlier API versions and so will always have the classes available at runtime. Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: I78863420bcfd401b63b35ef5a9252024d1550b27 Signed-off-by: Adrian DC <radian.dc@gmail.com>
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index e936e27..7624f1f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
android-support-v4 \
android-support-v7-recyclerview \
- guava
+ guava \
+ junit
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \