diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-23 17:35:11 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-23 17:35:11 +0800 |
| commit | d0f2ab6936edd2601fe5edac934a1af63d0715ae (patch) | |
| tree | 1b2145a9c21741c3225e110f63c28f8f7c08c81a /Makefile.common | |
| parent | efc1f78eb19df182e8d6cd49e228c15f360691d4 (diff) | |
| download | external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.zip external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.tar.gz external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.tar.bz2 | |
Re-enable Linux 64-bit emulator
Restore rules in Makefiles for Linux 64-bit emulator, now that
all the dependencies are merged (toolchain, lib64*.{a,so}, etc)
Change-Id: I25ecc53837ad9f10ceafb89d9e1d7a3124ce2d71
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index cecbf28..a72d719 100644 --- a/Makefile.common +++ b/Makefile.common @@ -139,12 +139,11 @@ $(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),) +ifeq ($(HOST_OS),linux) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-common) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -295,7 +294,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),) +ifeq ($(HOST_OS),linux) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libui) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64 @@ -617,7 +616,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),) +ifeq ($(HOST_OS),linux) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libqemu) # gdbstub-xml.c contains C-compilable arrays corresponding to the content @@ -711,7 +710,7 @@ $(call end-emulator-library) ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),) +ifeq ($(HOST_OS),linux) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libelff) LOCAL_CPP_EXTENSION := .cc |