Merge "Change sample native-codec's minSDK to android-21"

2014-10-16 01:27:33 +00:00
parent a6e8e0d8fb 2437e141fe
commit 9376f14e28
3 changed files with 3 additions and 3 deletions
--- 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>
--- 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
--- 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