diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 80 |
1 files changed, 69 insertions, 11 deletions
diff --git a/tools/configure b/tools/configure index 12025ba942..20b9095f73 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -664,14 +664,19 @@ androidcc () { | |||
664 | exit | 664 | exit |
665 | fi | 665 | fi |
666 | if [ -z "$ANDROID_NDK_PATH" ]; then | 666 | if [ -z "$ANDROID_NDK_PATH" ]; then |
667 | echo "ERROR: You need the Android NDK installed (r5 or higher) and have the ANDROID_NDK_PATH" | 667 | echo "ERROR: You need the Android NDK installed (r16 or higher) and have the ANDROID_NDK_PATH" |
668 | echo "environment variable point to the root directory of the Android NDK." | 668 | echo "environment variable point to the root directory of the Android NDK." |
669 | exit | 669 | exit |
670 | fi | 670 | fi |
671 | buildhost=$(uname | tr "[:upper:]" "[:lower:]") | 671 | buildhost=$(uname | tr "[:upper:]" "[:lower:]") |
672 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | 672 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` |
673 | LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog" | 673 | LDOPTS="$LDOPTS -ldl -llog" |
674 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared" | 674 | if [ "$modelname" != "ibassodx50" ] && [ "$modelname" != "ibassodx90" ]; then |
675 | LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared" | ||
676 | fi | ||
677 | SHARED_LDFLAG="-shared" | ||
678 | SHARED_CFLAGS='' | ||
679 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" | ||
675 | ANDROID_ARCH=$1 # for android.make too | 680 | ANDROID_ARCH=$1 # for android.make too |
676 | gccchoice="4.6" | 681 | gccchoice="4.6" |
677 | # arch dependant stuff | 682 | # arch dependant stuff |
@@ -683,8 +688,8 @@ androidcc () { | |||
683 | # threads work fine so far | 688 | # threads work fine so far |
684 | thread_support="ASSEMBLER_THREADS" | 689 | thread_support="ASSEMBLER_THREADS" |
685 | GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ | 690 | GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \ |
686 | --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" | 691 | --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm" |
687 | LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-5/arch-arm" | 692 | LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm" |
688 | ;; | 693 | ;; |
689 | mips) | 694 | mips) |
690 | endian="little" | 695 | endian="little" |
@@ -1336,13 +1341,10 @@ cat <<EOF | |||
1336 | 203) Nokia N900 212) MA8 220) NWZ-E370/E380 series | 1341 | 203) Nokia N900 212) MA8 220) NWZ-E370/E380 series |
1337 | 204) Pandora 213) MA8C 221) NWZ-E360 series | 1342 | 204) Pandora 213) MA8C 221) NWZ-E360 series |
1338 | 205) Samsung YP-R0 | 1343 | 205) Samsung YP-R0 |
1339 | 206) Android MIPS | 1344 | 206) Android MIPS ==IHIFI== ==iBasso== |
1340 | 207) Android x86 | 1345 | 207) Android x86 230) 760 232) DX50 |
1341 | 208) Samsung YP-R1 | 1346 | 208) Samsung YP-R1 231) 960 233) DX90 |
1342 | 1347 | ||
1343 | ==IHIFI== | ||
1344 | 230) 760 | ||
1345 | 231) 960 | ||
1346 | 1348 | ||
1347 | EOF | 1349 | EOF |
1348 | 1350 | ||
@@ -3744,6 +3746,62 @@ fi | |||
3744 | t_model="ihifi" | 3746 | t_model="ihifi" |
3745 | ;; | 3747 | ;; |
3746 | 3748 | ||
3749 | 232|ibassodx50) | ||
3750 | application="yes" | ||
3751 | target_id=94 | ||
3752 | modelname="ibassodx50" | ||
3753 | target="DX50" | ||
3754 | app_type="android_standalone" | ||
3755 | lcd_orientation="landscape" | ||
3756 | sharedir="/system/rockbox/app_rockbox/rockbox" | ||
3757 | bindir="/system/rockbox/lib" | ||
3758 | libdir="/system/rockbox/app_rockbox" | ||
3759 | memory=32 | ||
3760 | uname=`uname` | ||
3761 | androidcc armeabi | ||
3762 | tool="cp " | ||
3763 | boottool="cp " | ||
3764 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
3765 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | ||
3766 | output="rockbox" | ||
3767 | bootoutput="rockbox" | ||
3768 | appextra="recorder:gui:radio:hosted/android" | ||
3769 | plugins="yes" | ||
3770 | swcodec="yes" | ||
3771 | # architecture, manufacturer and model for the target-tree build | ||
3772 | t_cpu="hosted" | ||
3773 | t_manufacturer="android" | ||
3774 | t_model="dx50" | ||
3775 | ;; | ||
3776 | |||
3777 | 233|ibassodx90) | ||
3778 | application="yes" | ||
3779 | target_id=95 | ||
3780 | modelname="ibassodx90" | ||
3781 | target="DX90" | ||
3782 | app_type="android_standalone" | ||
3783 | lcd_orientation="landscape" | ||
3784 | sharedir="/system/rockbox/app_rockbox/rockbox" | ||
3785 | bindir="/system/rockbox/lib" | ||
3786 | libdir="/system/rockbox/app_rockbox" | ||
3787 | memory=32 | ||
3788 | uname=`uname` | ||
3789 | androidcc armeabi | ||
3790 | tool="cp " | ||
3791 | boottool="cp " | ||
3792 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | ||
3793 | bmp2rb_native="$rootdir/tools/bmp2rb -f 4" | ||
3794 | output="rockbox" | ||
3795 | bootoutput="rockbox" | ||
3796 | appextra="recorder:gui:radio:hosted/android" | ||
3797 | plugins="yes" | ||
3798 | swcodec="yes" | ||
3799 | # architecture, manufacturer and model for the target-tree build | ||
3800 | t_cpu="hosted" | ||
3801 | t_manufacturer="android" | ||
3802 | t_model="dx50" | ||
3803 | ;; | ||
3804 | |||
3747 | *) | 3805 | *) |
3748 | echo "Please select a supported target platform!" | 3806 | echo "Please select a supported target platform!" |
3749 | exit 7 | 3807 | exit 7 |