am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"

[android-x86/build.git] / envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index b039bbc..f3947fb 100644 (file)
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -126,7 +126,9 @@ function setpaths()
     export ANDROID_EABI_TOOLCHAIN=
     local ARCH=$(get_build_var TARGET_ARCH)
     case $ARCH in
-        x86) toolchaindir=x86/i686-linux-android-$targetgccversion/bin
+        x86) toolchaindir=x86/x86_64-linux-android-$targetgccversion/bin
+            ;;
+        x86_64) toolchaindir=x86/x86_64-linux-android-$targetgccversion/bin
             ;;
         arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin
             ;;
@@ -431,6 +433,7 @@ function add_lunch_combo()
 add_lunch_combo aosp_arm-eng
 add_lunch_combo aosp_x86-eng
 add_lunch_combo aosp_mips-eng
+add_lunch_combo aosp_x86_64-eng
 add_lunch_combo vbox_x86-eng
 
 function print_lunch_menu()
@@ -611,7 +614,7 @@ function getdriver()
     if [ -n "$WITH_STATIC_ANALYZER" ]; then
         echo "\
 $T/prebuilts/clang/linux-x86/host/3.3/tools/scan-build/scan-build \
---use-analyzer $T/prebuilts/clang/linux-x86/host/3.3/bin/clang \
+--use-analyzer $T/prebuilts/clang/linux-x86/host/3.3/bin/analyzer \
 --status-bugs \
 --top=$T"
     fi
@@ -923,7 +926,7 @@ function gdbclient()
    local ARCH=$(get_build_var TARGET_ARCH)
    local GDB
    case "$ARCH" in
-       x86) GDB=i686-linux-android-gdb;;
+       x86) GDB=x86_64-linux-android-gdb;;
        arm) GDB=arm-linux-androideabi-gdb;;
        mips) GDB=mipsel-linux-android-gdb;;
        *) echo "Unknown arch $ARCH"; return 1;;