From 54a4707646911dcb5dc2c15023e85ffa432ceafe Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Fri, 20 May 2016 15:05:30 +0800
Subject: Gallery: build against current SDK

and bump min sdk version

CRs-Fixed: 986672
Change-Id: I7efd6304895d75bd7ea959808ef6948a5bd38dfe
---
 Android.mk          | 2 +-
 AndroidManifest.xml | 2 +-
 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" />
-- 
cgit v1.2.3