diff options
| author | Anton Hansson <hansson@google.com> | 2018-02-26 18:14:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-26 18:14:14 +0000 |
| commit | fb691a33d15ddeb7a427c48255fb287a99c1d29e (patch) | |
| tree | 98e37adac42fcad5f686c5a63eabd7a892ad26d4 | |
| parent | b16ce3146b8b8260a7f1ea74dd47cb39ac539c30 (diff) | |
| parent | 5d39cda0c19714f69f9fbd027c722ead39fecae9 (diff) | |
| download | ContactsProvider-o-mr1-iot-preview-7.tar.gz | |
Merge "packages/providers/ContactsProvider: 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-- | Android.mk | 1 | ||||
| -rw-r--r-- | tests/Android.mk | 1 | ||||
| -rw-r--r-- | tests2/Android.mk | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -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 |