aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2018-02-22 18:07:08 +0000
committerAnton Hansson <hansson@google.com>2018-02-22 18:07:08 +0000
commit5d39cda0c19714f69f9fbd027c722ead39fecae9 (patch)
tree98e37adac42fcad5f686c5a63eabd7a892ad26d4
parentb16ce3146b8b8260a7f1ea74dd47cb39ac539c30 (diff)
downloadContactsProvider-5d39cda0c19714f69f9fbd027c722ead39fecae9.tar.gz
packages/providers/ContactsProvider: 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: I87fb73d60bba6737a765505800e7a7549b26da66
-rw-r--r--Android.mk1
-rw-r--r--tests/Android.mk1
-rw-r--r--tests2/Android.mk1
3 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 8233e5be..d31ad73d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-common com.android.vcard guava
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.providers.contacts.*
LOCAL_PACKAGE_NAME := ContactsProvider
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := shared
LOCAL_PRIVILEGED_MODULE := true
diff --git a/tests/Android.mk b/tests/Android.mk
index 8df1d6d4..539b4368 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,6 +16,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := ContactsProviderTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_INSTRUMENTATION_FOR := ContactsProvider
diff --git a/tests2/Android.mk b/tests2/Android.mk
index bb4443f3..2662cfd1 100644
--- a/tests2/Android.mk
+++ b/tests2/Android.mk
@@ -30,6 +30,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := ContactsProviderTests2
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_INSTRUMENTATION_FOR := ContactsProvider