StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."

Browse Source 
* commit '5646d2f6aa851ca79440d573e73fa51cf6afaf81':
  Fix PATH setup for arm64.
This commit is contained in:
Torne (Richard Coles)
2014-04-28 16:06:24 +00:00
committed by Android Git Automerger
parent d4cc9dad6c 5646d2f6aa
commit 93d0245bc9
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
envsetup.sh
View File

@@ -116,7 +116,6 @@ function setpaths()
fi fi
# and in with the new # and in with the new
CODE_REVIEWS=
prebuiltdir=$(getprebuilt) prebuiltdir=$(getprebuilt)
gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS) gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)
@@ -161,12 +160,10 @@ function setpaths()
# Legacy toolchain configuration used for ARM kernel compilation # Legacy toolchain configuration used for ARM kernel compilation
toolchaindir=arm/arm-eabi-$targetgccversion/bin toolchaindir=arm/arm-eabi-$targetgccversion/bin
if [ -d "$gccprebuiltdir/$toolchaindir" ]; then if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
ANDROID_KERNEL_TOOLCHAIN_PATH="$gccprebuiltdir/$toolchaindir" export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"
export ARM_EABI_TOOLCHAIN=$ANDROID_KERNEL_TOOLCHAIN_PATH ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":
fi fi
;; ;;
mips) toolchaindir=mips/mips-eabi-4.4.3/bin
;;
*) *)
# No need to set ARM_EABI_TOOLCHAIN for other ARCHs # No need to set ARM_EABI_TOOLCHAIN for other ARCHs
;; ;;
@@ -174,7 +171,7 @@ function setpaths()
export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$CODE_REVIEWS:$ANDROID_DEV_SCRIPTS: export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS:
export PATH=$ANDROID_BUILD_PATHS$PATH export PATH=$ANDROID_BUILD_PATHS$PATH
unset ANDROID_JAVA_TOOLCHAIN unset ANDROID_JAVA_TOOLCHAIN