diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2017-05-10 13:53:50 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-05-10 16:52:47 -0700 |
| commit | 311ec8962bef83bc240809e8365722a3a57dfec0 (patch) | |
| tree | 001a6636ce1d55bd2e31ea69aa4ed2202591795d /tests/Android.mk | |
| parent | 090ce68ceecc09780db4797277a3aaf8c7546a0b (diff) | |
| parent | 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe (diff) | |
| download | android_packages_apps_Trebuchet-311ec8962bef83bc240809e8365722a3a57dfec0.tar.gz android_packages_apps_Trebuchet-311ec8962bef83bc240809e8365722a3a57dfec0.tar.bz2 android_packages_apps_Trebuchet-311ec8962bef83bc240809e8365722a3a57dfec0.zip | |
merged ub-launcher3-dorval, and resolved conflicts
Bug: 36904684
Bug: 37929893
Bug: 36068989
Test: make -j 32 dist checkbuild
Change-Id: If9b11b212852cb1048d54db2224dab4acf2d93e0
Diffstat (limited to 'tests/Android.mk')
| -rw-r--r-- | tests/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index c91e793fc..6e6453ca1 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -20,11 +20,14 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ ub-uiautomator \ - legacy-android-test + legacy-android-test \ + mockito-target-minus-junit4 LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml LOCAL_SDK_VERSION := current +LOCAL_MIN_SDK_VERSION := 21 LOCAL_PACKAGE_NAME := Launcher3Tests |