aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2018-02-22 17:46:54 +0000
committerAnton Hansson <hansson@google.com>2018-02-26 15:46:39 +0000
commit7b2f5d1007e4fe6c81499e3a58ad8299a130d696 (patch)
tree90f66e2ac2376074c9e13b5140c9ce9c0d46b195
parent3f01563afad6b3d2f0546a6260ef958a8173deb6 (diff)
downloadcalendar-7b2f5d1007e4fe6c81499e3a58ad8299a130d696.tar.gz
frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Icec5c913512e2cffbba52353d84559ca4793437b Merged-In: I6b6411cb008ddaf9f1aac419bf7432b3215f100a
-rw-r--r--tests/Android.mk5
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)