Merge change 4496
* changes: Switch default toolchain to 4.4.0 in master.
This commit is contained in:
commit
d67bb8630a
|
@ -38,7 +38,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
|||
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
|
||||
ifeq ($(strip $($(combo_target)TOOLS_PREFIX)),)
|
||||
$(combo_target)TOOLS_PREFIX := \
|
||||
prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.2.1/bin/arm-eabi-
|
||||
prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.4.0/bin/arm-eabi-
|
||||
endif
|
||||
|
||||
$(combo_target)CC := $($(combo_target)TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
|
|
@ -102,7 +102,7 @@ function setpaths()
|
|||
# and in with the new
|
||||
CODE_REVIEWS=
|
||||
prebuiltdir=$(getprebuilt)
|
||||
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.2.1/bin
|
||||
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.0/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
|
||||
|
|
Loading…
Reference in New Issue