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.target | |
| 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.target')
| -rw-r--r-- | Makefile.target | 4 |
1 files changed, 2 insertions, 2 deletions
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 += \ |