commit 311ec8962bef83bc240809e8365722a3a57dfec0
author Hyunyoung Song <hyunyoungs@google.com> Wed May 10 13:53:50 2017 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed May 10 16:52:47 2017 -0700
tree 001a6636ce1d55bd2e31ea69aa4ed2202591795d
parent 090ce68ceecc09780db4797277a3aaf8c7546a0b
parent 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe

merged ub-launcher3-dorval, and resolved conflicts
Bug: 36904684
Bug: 37929893
Bug: 36068989

Test: make -j 32 dist checkbuild
Change-Id: If9b11b212852cb1048d54db2224dab4acf2d93e0

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c91e793..6e6453c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,11 +20,14 @@
 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