diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-29 21:21:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-29 21:21:57 +0000 |
| commit | a22921fc31930887fc9d6b3fb1ceb37c0ad098c5 (patch) | |
| tree | da415c972694690d6486c6dabee9ba1c074c342c /tests | |
| parent | 75c7c5ae287e79e8502bc9e23853ff64def8e8bf (diff) | |
| parent | f7f8cf5743810a614079ff7d4202dd0c9cd969ed (diff) | |
| download | android_packages_apps_Trebuchet-a22921fc31930887fc9d6b3fb1ceb37c0ad098c5.tar.gz android_packages_apps_Trebuchet-a22921fc31930887fc9d6b3fb1ceb37c0ad098c5.tar.bz2 android_packages_apps_Trebuchet-a22921fc31930887fc9d6b3fb1ceb37c0ad098c5.zip | |
Merge "Fixing Test builds" into ub-launcher3-burnaby-polish
am: f7f8cf5743
* commit 'f7f8cf5743810a614079ff7d4202dd0c9cd969ed':
Fixing Test builds
Diffstat (limited to 'tests')
| -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 |