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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user