PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

merged ub-launcher3-dorval, and resolved conflicts

Browse Source 
Bug: 36904684
Bug: 37929893
Bug: 36068989

Test: make -j 32 dist checkbuild

Change-Id: I3da7113926cdcb933707b3864c4334223c11e25b
This commit is contained in:
Hyunyoung Song
2017-05-10 13:36:14 -07:00
parent 75b841b05b 5cfde85cb6
commit 6b140bed44
505 changed files with 25041 additions and 14977 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Android.mk
+4 -1
View File
@@ -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