From 2437e141fee12b2b4328a2f86b1734e6638e5936 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 15 Oct 2014 11:02:51 +0800
Subject: [PATCH] Change sample native-codec's minSDK to android-21

android-L is renamed as android-21 in both coming SDK and NDK

Change-Id: I57b0dbe4d6e8add178dadfa6306bfc40aad27206
---
 .../android-21/samples/native-codec/AndroidManifest.xml         | 2 +-
 .../android-21/samples/native-codec/default.properties          | 2 +-
 .../android-21/samples/native-codec/jni/Application.mk          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ndk/platforms/android-21/samples/native-codec/AndroidManifest.xml b/ndk/platforms/android-21/samples/native-codec/AndroidManifest.xml
index addf1f0e6..87b2b810a 100644
--- a/ndk/platforms/android-21/samples/native-codec/AndroidManifest.xml
+++ b/ndk/platforms/android-21/samples/native-codec/AndroidManifest.xml
@@ -15,7 +15,7 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" />
 
     <!-- INTERNET is needed to use a URI-based media player, depending on the URI -->
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
diff --git a/ndk/platforms/android-21/samples/native-codec/default.properties b/ndk/platforms/android-21/samples/native-codec/default.properties
index 92f9bf030..869e1651c 100644
--- a/ndk/platforms/android-21/samples/native-codec/default.properties
+++ b/ndk/platforms/android-21/samples/native-codec/default.properties
@@ -1,4 +1,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-L
+target=android-21
diff --git a/ndk/platforms/android-21/samples/native-codec/jni/Application.mk b/ndk/platforms/android-21/samples/native-codec/jni/Application.mk
index 5b3fb7259..bf4858ca1 100644
--- a/ndk/platforms/android-21/samples/native-codec/jni/Application.mk
+++ b/ndk/platforms/android-21/samples/native-codec/jni/Application.mk
@@ -1,2 +1,2 @@
-APP_PLATFORM := android-L
+APP_PLATFORM := android-21
 APP_ABI := all