merged ub-launcher3-dorval, and resolved conflicts

[android-x86/packages-apps-Launcher3.git] / tests / Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 61ee220..c7d4737 100644 (file)
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -17,11 +17,17 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := \
+       android-support-test \
+       ub-uiautomator \
+       mockito-target-minus-junit4 \
+       legacy-android-test
 
 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