diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-17 09:39:14 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-17 09:39:14 +0800 |
| commit | c69169a69fc72867717eb1f3c09aa57d9ed405c7 (patch) | |
| tree | bb244cf402e6b4a2ebcaa0aebd6ccb8b3e064eda /Makefile.android | |
| parent | b5419de956567e97226ae5df50d2bdc3a1be5e14 (diff) | |
| download | external_qemu-c69169a69fc72867717eb1f3c09aa57d9ed405c7.zip external_qemu-c69169a69fc72867717eb1f3c09aa57d9ed405c7.tar.gz external_qemu-c69169a69fc72867717eb1f3c09aa57d9ed405c7.tar.bz2 | |
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
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 12 |
1 files changed, 6 insertions, 6 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),) |