diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 08:55:16 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 08:55:16 +0000 |
commit | c6ca81329ab260699013a5a5ed99c0e7549cd94e (patch) | |
tree | 3032fc3ed44cc0f0a4427b817f70066df9b3ad4f | |
parent | 5c6fe5da9c9676005f55e12aa9da867678ff8e5c (diff) | |
download | rockbox-c6ca81329ab260699013a5a5ed99c0e7549cd94e.tar.gz rockbox-c6ca81329ab260699013a5a5ed99c0e7549cd94e.zip |
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
-rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxPCM.java | 5 | ||||
-rw-r--r-- | android/src/org/rockbox/monitors/HeadphoneMonitor.java | 2 | ||||
-rwxr-xr-x | 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 @@ | |||
80 | 80 | ||
81 | </application> | 81 | </application> |
82 | 82 | ||
83 | <uses-sdk android:minSdkVersion="4" /> | 83 | <uses-sdk android:minSdkVersion="11" /> |
84 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> | 84 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> |
85 | <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission> | 85 | <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission> |
86 | </manifest> | 86 | </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 | |||
138 | /* 1 sample is 2 bytes, 2 samples are 1 frame */ | 138 | /* 1 sample is 2 bytes, 2 samples are 1 frame */ |
139 | return (bytes/4); | 139 | return (bytes/4); |
140 | } | 140 | } |
141 | 141 | ||
142 | @SuppressWarnings("unused") | ||
143 | private int frames2bytes(int frames) | 142 | private int frames2bytes(int frames) |
144 | { | 143 | { |
145 | /* 1 frame is 2 samples, 1 sample is 2 bytes */ | 144 | /* 1 frame is 2 samples, 1 sample is 2 bytes */ |
146 | return (frames*4); | 145 | return (frames*4); |
147 | } | 146 | } |
148 | 147 | ||
149 | @SuppressWarnings("unused") | ||
150 | private void play_pause(boolean pause) | 148 | private void play_pause(boolean pause) |
151 | { | 149 | { |
152 | RockboxService service = RockboxService.get_instance(); | 150 | RockboxService service = RockboxService.get_instance(); |
@@ -204,7 +202,6 @@ public class RockboxPCM extends AudioTrack | |||
204 | return super.setStereoVolume(leftVolume, rightVolume); | 202 | return super.setStereoVolume(leftVolume, rightVolume); |
205 | } | 203 | } |
206 | 204 | ||
207 | @SuppressWarnings("unused") | ||
208 | private void set_volume(int volume) | 205 | private void set_volume(int volume) |
209 | { | 206 | { |
210 | Logger.d("java:set_volume("+volume+")"); | 207 | 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; | |||
28 | 28 | ||
29 | public class HeadphoneMonitor extends BroadcastReceiver | 29 | public class HeadphoneMonitor extends BroadcastReceiver |
30 | { | 30 | { |
31 | @SuppressWarnings("unused") | ||
32 | |||
33 | public HeadphoneMonitor(Context c) | 31 | public HeadphoneMonitor(Context c) |
34 | { | 32 | { |
35 | IntentFilter hpFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG); | 33 | 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 () { | |||
663 | prefixtools $gcctarget | 663 | prefixtools $gcctarget |
664 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | 664 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` |
665 | GCCOPTS="$GCCOPTS -ffunction-sections -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ | 665 | GCCOPTS="$GCCOPTS -ffunction-sections -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ |
666 | --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" | 666 | --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" |
667 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \ | 667 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \ |
668 | --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" | 668 | --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" |
669 | LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog" | 669 | LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog" |
670 | endian="little" | 670 | endian="little" |
671 | SHARED_LDFLAG="-shared" | 671 | SHARED_LDFLAG="-shared" |