Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Android: Fix a few java warnings. Upgrade ndk platform to 2.0 (don't support 1.6 anymore).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30293 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-08-14 08:55:16 +00:00
parent 5c6fe5da9c
commit c6ca81329a
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/AndroidManifest.xml
View file

@ -80,7 +80,7 @@
</application> </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.WRITE_EXTERNAL_STORAGE"></uses-permission>
<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission> <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
</manifest> </manifest>

5
android/src/org/rockbox/RockboxPCM.java
View file

@ -138,15 +138,13 @@ public class RockboxPCM extends AudioTrack
/* 1 sample is 2 bytes, 2 samples are 1 frame */ /* 1 sample is 2 bytes, 2 samples are 1 frame */
return (bytes/4); return (bytes/4);
} }
@SuppressWarnings("unused")
private int frames2bytes(int frames) private int frames2bytes(int frames)
{ {
/* 1 frame is 2 samples, 1 sample is 2 bytes */ /* 1 frame is 2 samples, 1 sample is 2 bytes */
return (frames*4); return (frames*4);
} }
@SuppressWarnings("unused")
private void play_pause(boolean pause) private void play_pause(boolean pause)
{ {
RockboxService service = RockboxService.get_instance(); RockboxService service = RockboxService.get_instance();
@ -204,7 +202,6 @@ public class RockboxPCM extends AudioTrack
return super.setStereoVolume(leftVolume, rightVolume); return super.setStereoVolume(leftVolume, rightVolume);
} }
@SuppressWarnings("unused")
private void set_volume(int volume) private void set_volume(int volume)
{ {
Logger.d("java:set_volume("+volume+")"); Logger.d("java:set_volume("+volume+")");

2
android/src/org/rockbox/monitors/HeadphoneMonitor.java
View file

@ -28,8 +28,6 @@ import android.content.IntentFilter;
public class HeadphoneMonitor extends BroadcastReceiver public class HeadphoneMonitor extends BroadcastReceiver
{ {
@SuppressWarnings("unused")
public HeadphoneMonitor(Context c) public HeadphoneMonitor(Context c)
{ {
IntentFilter hpFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG); IntentFilter hpFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);

4
tools/configure vendored
View file

@ -663,9 +663,9 @@ androidcc () {
prefixtools $gcctarget prefixtools $gcctarget
GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` 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 \ 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 \ 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" LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog"
endian="little" endian="little"
SHARED_LDFLAG="-shared" SHARED_LDFLAG="-shared"