diff options
author | Jing Yu <jingyu@google.com> | 2010-07-29 15:07:31 -0700 |
---|---|---|
committer | Jing Yu <jingyu@google.com> | 2010-07-29 19:09:12 -0700 |
commit | 9d396e37ac695916671614ab89797652ed02538c (patch) | |
tree | fb710b8127ab776ad2cff0bad084c6c9c80d3e0f | |
parent | 778c2b690025a91b55b2e841921605c55baf652c (diff) | |
download | build-9d396e37ac695916671614ab89797652ed02538c.zip build-9d396e37ac695916671614ab89797652ed02538c.tar.gz build-9d396e37ac695916671614ab89797652ed02538c.tar.bz2 |
Make arm-linux-androideabi toolchain the default for Android build.
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.
kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.
The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.
Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
-rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 | ||||
-rw-r--r-- | core/dumpvar.mk | 2 | ||||
-rw-r--r-- | core/prelink-linux-arm.map | 2 | ||||
-rw-r--r-- | envsetup.sh | 7 | ||||
-rwxr-xr-x | tools/adbs | 12 |
5 files changed, 13 insertions, 12 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 98bb00d..520f30e 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -44,7 +44,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) TARGET_TOOLS_PREFIX := \ - prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi- endif TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) diff --git a/core/dumpvar.mk b/core/dumpvar.mk index f469f35..4bc9541 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -9,7 +9,7 @@ ifeq ($(TARGET_SIMULATOR),true) ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES) else # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.3/bin + ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin endif ANDROID_BUILD_PATHS := $(ABP) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map index 0090441..b178242 100644 --- a/core/prelink-linux-arm.map +++ b/core/prelink-linux-arm.map @@ -19,7 +19,7 @@ # # note: look at the LOAD sections in the library header: # -# arm-eabi-objdump -x <lib> +# arm-linux-androideabi-objdump -x <lib> # # core system libraries diff --git a/envsetup.sh b/envsetup.sh index df7bfc1..ab5253b 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -106,10 +106,11 @@ function setpaths() # and in with the new CODE_REVIEWS= prebuiltdir=$(getprebuilt) - export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.3/bin + export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-linux-androideabi-4.4.x/bin + export ARM_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.3/bin export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN export ANDROID_QTOOLS=$T/development/emulator/qtools - export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_EABI_TOOLCHAIN$CODE_REVIEWS + export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS export PATH=$PATH$ANDROID_BUILD_PATHS unset ANDROID_JAVA_TOOLCHAIN @@ -787,7 +788,7 @@ function gdbclient() echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT" echo >>"$OUT_ROOT/gdbclient.cmds" "" - arm-eabi-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE" + arm-linux-androideabi-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE" else echo "Unable to determine build system output dir." fi @@ -144,23 +144,23 @@ def SetupToolsPath(): uname = "darwin-ppc" elif uname == "Linux": uname = "linux-x86" - prefix = "./prebuilt/" + uname + "/toolchain/arm-eabi-4.4.3/bin/" - addr2line_cmd = prefix + "arm-eabi-addr2line" + prefix = "./prebuilt/" + uname + "/toolchain/arm-linux-androideabi-4.4.x/bin/" + addr2line_cmd = prefix + "arm-linux-androideabi-addr2line" if (not os.path.exists(addr2line_cmd)): try: prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilt/" + uname + \ - "/toolchain/arm-eabi-4.4.3/bin/" + "/toolchain/arm-linux-androideabi-4.4.x/bin/" except: prefix = ""; - addr2line_cmd = prefix + "arm-eabi-addr2line" + addr2line_cmd = prefix + "arm-linux-androideabi-addr2line" if (not os.path.exists(addr2line_cmd)): print addr2line_cmd + " not found!" sys.exit(1) - objdump_cmd = prefix + "arm-eabi-objdump" - cppfilt_cmd = prefix + "arm-eabi-c++filt" + objdump_cmd = prefix + "arm-linux-androideabi-objdump" + cppfilt_cmd = prefix + "arm-linux-androideabi-c++filt" ############################################################################### # look up the function and file/line number for a raw stack trace line |