diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-29 21:18:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-29 21:18:02 +0000 |
| commit | f7f8cf5743810a614079ff7d4202dd0c9cd969ed (patch) | |
| tree | f7d759237c071fad07132c2b6c5a1d48f2c53b2b | |
| parent | 6362683acb884ec72fe10f1cf394d178d3918a96 (diff) | |
| parent | ca846f8f54deebbc139458ca088ec15543f09722 (diff) | |
| download | android_packages_apps_Trebuchet-f7f8cf5743810a614079ff7d4202dd0c9cd969ed.tar.gz android_packages_apps_Trebuchet-f7f8cf5743810a614079ff7d4202dd0c9cd969ed.tar.bz2 android_packages_apps_Trebuchet-f7f8cf5743810a614079ff7d4202dd0c9cd969ed.zip | |
Merge "Fixing Test builds" into ub-launcher3-burnaby-polish
| -rw-r--r-- | tests/Android.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index eba4ade48..d82f0b35c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -14,21 +14,17 @@ # LOCAL_PATH := $(call my-dir) - -src_dirs := src -res_dirs := res - include $(CLEAR_VARS) +src_dirs := src LOCAL_MODULE_TAGS := tests - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_AAPT_FLAGS := --auto-add-overlay -LOCAL_SDK_VERSION := 21 +LOCAL_SDK_VERSION := 23 LOCAL_PACKAGE_NAME := Launcher3Tests |