Index: beagledroid/build/core/combo/linux-arm.mk
===================================================================
--- beagledroid.orig/build/core/combo/linux-arm.mk	2009-07-01 00:27:54.000000000 +0800
+++ beagledroid/build/core/combo/linux-arm.mk	2009-07-01 00:41:42.000000000 +0800
@@ -4,7 +4,7 @@
 # You can set TARGET_ARCH_VERSION to use an arch version other
 # than ARMv5TE
 ifeq ($(strip $(TARGET_ARCH_VERSION)),)
-TARGET_ARCH_VERSION := armv5te
+TARGET_ARCH_VERSION := armv7
 endif
 
 # This set of if blocks sets makefile variables similar to preprocesser
@@ -31,16 +31,20 @@
 # code in assembler source since the bx (branch and exchange) instruction is
 # not supported.
 #
-ifeq ($(TARGET_ARCH_VERSION),armv5te)
+ifeq ($(TARGET_ARCH_VERSION),armv7)
 ARCH_ARM_HAVE_THUMB_SUPPORT := true
+ARCH_ARM_HAVE_THUMB_INTERWORKING := true
 ARCH_ARM_HAVE_FAST_INTERWORKING := true
 ARCH_ARM_HAVE_64BIT_DATA := true
 ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true
 ARCH_ARM_HAVE_CLZ := true
 ARCH_ARM_HAVE_FFS := true
 
-arch_version_cflags := -march=armv5te -mtune=xscale  -D__ARM_ARCH_5__ \
-	-D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__
+arch_version_cflags := -march=armv7-a -mtune=cortex-a8 \
+	-mfpu=neon -mfloat-abi=softfp \
+	-ftree-vectorize -ffast-math \
+	-D__ARM_ARCH_7__ \
+	-D__ARM_ARCH_7A__
 else
 ifeq ($(TARGET_ARCH_VERSION),armv4t)
 $(warning ARMv4t support is currently a work in progress. It does not work right now!)
Index: beagledroid/dalvik/vm/Android.mk
===================================================================
--- beagledroid.orig/dalvik/vm/Android.mk	2009-07-01 00:51:28.000000000 +0800
+++ beagledroid/dalvik/vm/Android.mk	2009-07-01 00:53:47.000000000 +0800
@@ -241,8 +241,8 @@
   else
     # Select architecture specific sources (armv4,armv5te etc)
     LOCAL_SRC_FILES += \
-		mterp/out/InterpC-$(TARGET_ARCH_VERSION).c.arm \
-		mterp/out/InterpAsm-$(TARGET_ARCH_VERSION).S
+		mterp/out/InterpC-armv5te.c.arm \
+		mterp/out/InterpAsm-armv5te.S
   endif
   LOCAL_SHARED_LIBRARIES += libdl
 else
Index: beagledroid/external/bluez/utils/audio/Android.mk
===================================================================
--- beagledroid.orig/external/bluez/utils/audio/Android.mk	2009-07-01 10:24:16.000000000 +0800
+++ beagledroid/external/bluez/utils/audio/Android.mk	2009-07-01 10:24:35.000000000 +0800
@@ -53,7 +53,8 @@
 	liba2dp.c \
 	ipc.c \
 	../sbc/sbc.c.arm \
-	../sbc/sbc_primitives.c
+	../sbc/sbc_primitives.c \
+	../sbc/sbc_primitives_neon.c
 
 # to improve SBC performance
 LOCAL_CFLAGS:= -funroll-loops