Guest User

Android - Rockbox [Friday, December 4th, 2015]

a guest
Dec 3rd, 2015
100
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/android/android.make b/android/android.make
  2. index 6f7cb8a..05c399c 100644
  3. --- a/android/android.make
  4. +++ b/android/android.make
  5. @@ -32,10 +32,10 @@ ANDROID_PLATFORM_VERSION=19
  6. ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION)
  7.  
  8. # android tools
  9. -BUILD_TOOLS_VERSION=$(notdir $(firstword $(wildcard $(ANDROID_SDK_PATH)/build-tools/$(ANDROID_PLATFORM_VERSION).*)))
  10. +BUILD_TOOLS_VERSION=23.0.2
  11. AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt
  12. DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx
  13. -ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
  14. +ZIPALIGN=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/zipalign
  15. KEYSTORE=$(HOME)/.android/debug.keystore
  16. ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
  17. BUILDAPK=$(ANDROID_DIR)/buildapk.sh
  18. diff --git a/tools/configure b/tools/configure
  19. index ec83502..8e42ce6 100755
  20. --- a/tools/configure
  21. +++ b/tools/configure
  22. @@ -676,7 +676,7 @@ androidcc () {
  23. fi
  24. SHARED_LDFLAG="-shared"
  25. SHARED_CFLAGS=''
  26. - GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
  27. + GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack,-fuse-ld=bfd"
  28. ANDROID_ARCH=$1 # for android.make too
  29. gccchoice="4.6"
  30. # arch dependant stuff
  31. @@ -688,8 +688,8 @@ androidcc () {
  32. # threads work fine so far
  33. thread_support="ASSEMBLER_THREADS"
  34. GCCOPTS="$GCCOPTS -march=armv5te -mtune=xscale -msoft-float -fomit-frame-pointer \
  35. - --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm"
  36. - LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-16/arch-arm"
  37. + --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-arm"
  38. + LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-19/arch-arm"
  39. ;;
  40. mips)
  41. endian="little"
RAW Paste Data