diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-17 08:22:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-17 08:22:24 +0000 |
| commit | 4f556e03c830e60d3ef6d1c0cb1b6a7fb57e41d9 (patch) | |
| tree | 711856bd7d6b9d36c46942eb09199e5e4e6c07fa | |
| parent | 3fccf5176c127cccefe10420026dd1aed8dc0ee4 (diff) | |
| parent | bfa60eef17d4be6564e7d5528e50930195fc3fd8 (diff) | |
| download | PartnerBookmarksProvider-4f556e03c830e60d3ef6d1c0cb1b6a7fb57e41d9.tar.gz | |
Snap for 4507345 from bfa60eef17d4be6564e7d5528e50930195fc3fd8 to pi-release
Change-Id: Id751903ac84cd825711ef4c8d677b191874778c2
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | proguard.flags | 4 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -23,6 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PartnerBookmarksProvider +LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 46dc555..719070c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,5 +22,4 @@ <provider android:name="PartnerBookmarksProvider" android:authorities="com.android.partnerbookmarks" /> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" /> </manifest> diff --git a/proguard.flags b/proguard.flags new file mode 100644 index 0000000..07aad51 --- /dev/null +++ b/proguard.flags @@ -0,0 +1,4 @@ +# Needed for tests +-keep class com.android.providers.partnerbookmarks.PartnerBookmarksContract$Bookmarks { + *; +} diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 6e6ba14..40d8196 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -32,6 +32,4 @@ <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="com.android.providers.partnerbookmarks" android:label="partner bookmarks provider tests"/> - - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" /> </manifest> |