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

resolved conflicts for merge of 296e4828 to master

Browse Source 
Change-Id: Iae41a458f1eed497119c3abe4bf27194821c075d
This commit is contained in:
David 'Digit' Turner
2012-04-17 14:50:47 +02:00
parent 3bdcae333f 296e4828ae
commit 2056c25edd
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
envsetup.sh
View File

@@ -116,17 +116,21 @@ function setpaths()
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it. # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
export ANDROID_EABI_TOOLCHAIN= export ANDROID_EABI_TOOLCHAIN=
toolchaindir=arm/arm-linux-androideabi-4.6/bin local ARCH=$(get_build_var TARGET_ARCH)
case $ARCH in
x86) toolchaindir=x86/i686-android-linux-4.4.3/bin
;;
arm) toolchaindir=arm/arm-linux-androideabi-4.6/bin
;;
*)
echo "Can't find toolchain for unknown architecture: $ARCH"
toolchaindir=xxxxxxxxx
;;
esac
if [ -d "$gccprebuiltdir/$toolchaindir" ]; then if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir export ANDROID_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
fi fi
export ARM_EABI_TOOLCHAIN=
toolchaindir=arm/arm-eabi-4.6/bin
if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
export ARM_EABI_TOOLCHAIN=$gccprebuiltdir/$toolchaindir
fi
export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN
export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS
@@ -762,7 +766,7 @@ function gdbclient()
echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT" echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
echo >>"$OUT_ROOT/gdbclient.cmds" "" echo >>"$OUT_ROOT/gdbclient.cmds" ""
$GDB -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE" $ANDROID_TOOLCHAIN/$GDB -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
else else
echo "Unable to determine build system output dir." echo "Unable to determine build system output dir."
fi fi