From c69169a69fc72867717eb1f3c09aa57d9ed405c7 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Sat, 17 Mar 2012 09:39:14 +0800
Subject: Revert to previous prebuilt toolchain until new ones are available in
 AOSP

The new prebuilt toolchains prebuilts/tools/gcc-sdk points to aren't
available in AOSP yet (*).  Without it, 64-bit emulator can't be built.
Revert to previous prebuilt toochain and disable 64-bit emulator for now.

(*) This git auto-sync to AOSP in short-time

Change-Id: I7301bcbcbc1d4505d34ad69b562d0b9e5968093a
---
 Makefile.android | 12 ++++++------
 Makefile.common  |  9 +++++----
 Makefile.target  |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile.android b/Makefile.android
index 6fccf71..c526172 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -98,13 +98,13 @@ ifneq ($(BUILD_STANDALONE_EMULATOR),true)
   # which contains the relevant headers and 32-bit libraries for audio (The host 64-bit
   # Lucid doesn't provide these anymore, only their 64-bit versions).
   ifeq ($(HOST_OS),linux)
-    HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk
+    HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux
     # Don't do anything if the toolchain is not there
-    ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc)))
-      MY_CC  := $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc
-      MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)/g++
-      MY_AR  := $(HOST_SDK_TOOLCHAIN_PREFIX)/ar
-    endif # $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc exists
+    ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc)))
+      MY_CC  := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc
+      MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++
+      MY_AR  := $(HOST_SDK_TOOLCHAIN_PREFIX)-ar
+    endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists
   endif # HOST_OS == linux
 
   ifneq ($(USE_CCACHE),)
diff --git a/Makefile.common b/Makefile.common
index a72d719..cecbf28 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -139,11 +139,12 @@ $(call gen-hw-config-defs)
 $(call end-emulator-library)
 
 ## another for 64-bit
+##### NOTE: disable 64-bit for now until new 64-bit prebuilts/gcc toolchain exist in AOSP
 # NOTE: only linux in non-standalone mode is supported, because
 #  1) For Windows: amd64-mingw32msvc-gcc doesn't work, see http://b/issue?id=5949152.
 #  2) For MacOSX: 64-bit libSDL*.a 1.2.x depends on NSQuickDrawView doesn't exist
 #  3) Standalone has --try-64
-ifeq ($(HOST_OS),linux)
+ifeq ($(HOST_OS),)
   ifneq ($(BUILD_STANDALONE_EMULATOR),true)
     $(call start-emulator-library, emulator64-common)
     LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -294,7 +295,7 @@ $(call end-emulator-library)
 
 
 ## another for 64-bit, see note in emulator64-common
-ifeq ($(HOST_OS),linux)
+ifeq ($(HOST_OS),)
   ifneq ($(BUILD_STANDALONE_EMULATOR),true)
     $(call start-emulator-library, emulator64-libui)
     LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -616,7 +617,7 @@ $(call end-emulator-library)
 
 
 ## another for 64-bit, see note in emulator64-common
-ifeq ($(HOST_OS),linux)
+ifeq ($(HOST_OS),)
   ifneq ($(BUILD_STANDALONE_EMULATOR),true)
     $(call start-emulator-library, emulator64-libqemu)
     # gdbstub-xml.c contains C-compilable arrays corresponding to the content
@@ -710,7 +711,7 @@ $(call end-emulator-library)
 
 
 ## another for 64-bit, see note in emulator64-common
-ifeq ($(HOST_OS),linux)
+ifeq ($(HOST_OS),)
   ifneq ($(BUILD_STANDALONE_EMULATOR),true)
     $(call start-emulator-library, emulator64-libelff)
     LOCAL_CPP_EXTENSION := .cc
diff --git a/Makefile.target b/Makefile.target
index 1961acf..92ac855 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -246,7 +246,7 @@ $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c)
 $(call end-emulator-library)
 
 ## another for 64-bit, see note in file Makefile.common emulator64-common
-ifeq ($(HOST_OS),linux)
+ifeq ($(HOST_OS),)
   ifneq ($(BUILD_STANDALONE_EMULATOR),true)
     $(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU))
     LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -433,7 +433,7 @@ $(call end-emulator-program)
 
 
 ## another for 64-bit, see note in file Makefile.common emulator64-common
-ifeq ($(HOST_OS),linux)
+ifeq ($(HOST_OS),)
   ifneq ($(BUILD_STANDALONE_EMULATOR),true)
     $(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH))
     LOCAL_STATIC_LIBRARIES += \
-- 
cgit v1.1