commit 6b140bed44cd97177f46e8ccc8fb52c96fe24cb4
author Hyunyoung Song <hyunyoungs@google.com> Wed May 10 13:36:14 2017 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed May 10 16:51:21 2017 -0700
tree 3acc3dbaa19350783d9b8b7f5ca803b999792510
parent 75b841b05be8d816b3421dac2b4ea964e03bf97c
parent 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe

merged ub-launcher3-dorval, and resolved conflicts

Bug: 36904684
Bug: 37929893
Bug: 36068989

Test: make -j 32 dist checkbuild

Change-Id: I3da7113926cdcb933707b3864c4334223c11e25b

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c91e793..aaf0572 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