diff options
| author | Anton Hansson <hansson@google.com> | 2018-02-26 17:08:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-26 17:08:39 +0000 |
| commit | 03dbebcdc8c9dfe18b51fe129ca03c846b3a6ff7 (patch) | |
| tree | 90f66e2ac2376074c9e13b5140c9ce9c0d46b195 | |
| parent | 3f01563afad6b3d2f0546a6260ef958a8173deb6 (diff) | |
| parent | 7b2f5d1007e4fe6c81499e3a58ad8299a130d696 (diff) | |
| download | calendar-03dbebcdc8c9dfe18b51fe129ca03c846b3a6ff7.tar.gz | |
Merge "frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
| -rw-r--r-- | tests/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 7a288ac..d766463 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,8 +17,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := CalendarCommonTests +LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs +LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit include $(BUILD_PACKAGE) |