From c69169a69fc72867717eb1f3c09aa57d9ed405c7 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh 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 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile.android') 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),) -- cgit v1.1