From c6ca81329ab260699013a5a5ed99c0e7549cd94e Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Sun, 14 Aug 2011 08:55:16 +0000
Subject: [PATCH] Android: Fix a few java warnings. Upgrade ndk platform to 2.0
 (don't support 1.6 anymore).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30293 a1c6a512-1295-4272-9138-f99709370657
---
 android/AndroidManifest.xml                            | 2 +-
 android/src/org/rockbox/RockboxPCM.java                | 5 +----
 android/src/org/rockbox/monitors/HeadphoneMonitor.java | 2 --
 tools/configure                                        | 4 ++--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c32f76c0d0..fa4f494288 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -80,7 +80,7 @@
 	
 	</application>
 
-	<uses-sdk android:minSdkVersion="4" />
+	<uses-sdk android:minSdkVersion="11" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
 	<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
 </manifest> 
diff --git a/android/src/org/rockbox/RockboxPCM.java b/android/src/org/rockbox/RockboxPCM.java
index 5ed2a9050d..f77bf3bb8f 100644
--- a/android/src/org/rockbox/RockboxPCM.java
+++ b/android/src/org/rockbox/RockboxPCM.java
@@ -138,15 +138,13 @@ public class RockboxPCM extends AudioTrack
         /* 1 sample is 2 bytes, 2 samples are 1 frame */
         return (bytes/4);
     }
-    
-    @SuppressWarnings("unused")
+
     private int frames2bytes(int frames) 
     {
         /* 1 frame is 2 samples, 1 sample is 2 bytes */
         return (frames*4);
     }
 
-    @SuppressWarnings("unused")
     private void play_pause(boolean pause) 
     {
         RockboxService service = RockboxService.get_instance();
@@ -204,7 +202,6 @@ public class RockboxPCM extends AudioTrack
         return super.setStereoVolume(leftVolume, rightVolume);
     }
 
-    @SuppressWarnings("unused")
     private void set_volume(int volume)
     {
         Logger.d("java:set_volume("+volume+")");
diff --git a/android/src/org/rockbox/monitors/HeadphoneMonitor.java b/android/src/org/rockbox/monitors/HeadphoneMonitor.java
index 72a2f262f2..6b58b1dd80 100644
--- a/android/src/org/rockbox/monitors/HeadphoneMonitor.java
+++ b/android/src/org/rockbox/monitors/HeadphoneMonitor.java
@@ -28,8 +28,6 @@ import android.content.IntentFilter;
 
 public class HeadphoneMonitor extends BroadcastReceiver
 {
-    @SuppressWarnings("unused")
-
     public HeadphoneMonitor(Context c)
     {
         IntentFilter hpFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);
diff --git a/tools/configure b/tools/configure
index 1cedebf787..b28d3c4c97 100755
--- a/tools/configure
+++ b/tools/configure
@@ -663,9 +663,9 @@ androidcc () {
     prefixtools $gcctarget
     GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
     GCCOPTS="$GCCOPTS -ffunction-sections -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
-		--sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm"
+		--sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
     GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \
-		--sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm"
+		--sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm"
     LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog"
     endian="little"
     SHARED_LDFLAG="-shared"