diff options
| author | Anton Hansson <hansson@google.com> | 2018-02-26 18:41:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-26 18:41:51 +0000 |
| commit | ba7155f8367a25deec2b16069241731ff92a7257 (patch) | |
| tree | 16b3a6eea185519c42a292654fc34715617be3c8 | |
| parent | a46b29830088c91a21ce390cd5981740ac3bc08b (diff) | |
| parent | 3116143a3978e76278d6c3ce4301f0920da09d5f (diff) | |
| download | ContactsProvider-ba7155f8367a25deec2b16069241731ff92a7257.tar.gz | |
Merge "packages/providers/ContactsProvider: Set LOCAL_SDK_VERSION where possible." am: fb691a33d1 am: 7e03fe9bb2
am: 3116143a39
Change-Id: I3b6d795b2b324befaef5965dff263ddbde9d6a37
| -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 e0c62843..02ea81e9 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -15,6 +15,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock 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 4a0fdfb0..4ba0a12f 100644 --- a/tests2/Android.mk +++ b/tests2/Android.mk @@ -29,6 +29,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base 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 |