summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>2017-12-14 11:35:33 +0000
committerPrzemyslaw Szczepaniak <pszczepaniak@google.com>2017-12-14 11:49:29 +0000
commitbfa60eef17d4be6564e7d5528e50930195fc3fd8 (patch)
tree711856bd7d6b9d36c46942eb09199e5e4e6c07fa
parent394c62c34ef02f20ab8ec2a98db18a9290bbcdd2 (diff)
downloadPartnerBookmarksProvider-bfa60eef17d4be6564e7d5528e50930195fc3fd8.tar.gz
Remove uses-sdk, target platform API level.
Android P plans to drop support for pre-API level 17 targetSdkVersion, so this app in its current form would not run. + Added proguard.flags to keep a class required by tests. Bug: 69916345 Test: PartnerBookmarksProviderTest Change-Id: Ie722e6e49bcc88b07ab42bba002ddb0d2583d5d5
-rw-r--r--Android.mk1
-rw-r--r--AndroidManifest.xml1
-rw-r--r--proguard.flags4
-rw-r--r--tests/AndroidManifest.xml2
4 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 6978cfa..be94d89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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>