summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2016-05-20 15:05:30 +0800
committerLikai Ding <likaid@codeaurora.org>2016-06-03 15:39:39 +0800
commit54a4707646911dcb5dc2c15023e85ffa432ceafe (patch)
tree4e1980395abba0ad7a73f795c5aabb74f79b7167
parent4dc5e6d88c57ca9ab34169572fbef104293bbe82 (diff)
downloadandroid_packages_apps_Gallery2-54a4707646911dcb5dc2c15023e85ffa432ceafe.tar.gz
android_packages_apps_Gallery2-54a4707646911dcb5dc2c15023e85ffa432ceafe.tar.bz2
android_packages_apps_Gallery2-54a4707646911dcb5dc2c15023e85ffa432ceafe.zip
Gallery: build against current SDK
and bump min sdk version CRs-Fixed: 986672 Change-Id: I7efd6304895d75bd7ea959808ef6948a5bd38dfe
-rw-r--r--Android.mk2
-rw-r--r--AndroidManifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 54f8e0e43..0f7ee5341 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,7 +43,7 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D Gallery2
LOCAL_PROGUARD_ENABLED := disabled
-#LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
LOCAL_SHARED_LIBRARIES += libjni_dualcamera
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 37c925c4b..a71c0b72a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,7 @@
<original-package android:name="com.android.gallery3d" />
- <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="23"/>
+ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23"/>
<permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:protectionLevel="signatureOrSystem" />