Build both 32-bit and 64-bit binaries in standalone build.
This only works for Linux and OS X builds for now, until
Windows 64-bit compilation is fixed.
+ Remove --arch=<name> and --try-64 flags to android-configure.sh
and android-rebuild.sh, since they're not needed anymore.
+ Remove the build of obsolete 'emulator-ui' and 'qemu-android-xxx'
programs. We don't need them for now, and it's likely things will
change a lot once we want to work on remote display / UI.
http://b.android.com/64805
Change-Id: I70be38d53650648f74323eb33284661a8bb77c88
diff --git a/Makefile.target b/Makefile.target
index d597e1d..ad7a936 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -281,100 +281,14 @@
## another for 64-bit, see note in file Makefile.common emulator64-common
ifneq ($(filter linux darwin,$(HOST_OS)),)
- ifneq ($(BUILD_STANDALONE_EMULATOR),true)
- $(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU))
- LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
- LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES)
- $(call gen-hw-config-defs)
- $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c)
- $(call end-emulator-library)
- endif # BUILD_STANDALONE_EMULATOR == nil
+ $(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU))
+ LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
+ LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES)
+ $(call gen-hw-config-defs)
+ $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c)
+ $(call end-emulator-library)
endif # HOST_OS == linux || darwin
-
-
-##############################################################################
-##############################################################################
-###
-### qemu-android-$CPU: headless emulator core program
-###
-###
-$(call start-emulator-program, qemu-android-$(EMULATOR_TARGET_ARCH))
-
-LOCAL_CFLAGS += \
- $(EMULATOR_COMMON_CFLAGS) \
- $(ELFF_CFLAGS) \
- $(EMULATOR_LIBQEMU_CFLAGS) \
- $(EMULATOR_TARGET_CFLAGS) \
- -DCONFIG_STANDALONE_CORE
-
-ifneq ($(QEMU_OPENGLES_INCLUDE),)
- LOCAL_CFLAGS += -I$(QEMU_OPENGLES_INCLUDE)
-endif
-
-LOCAL_CFLAGS += $(GCC_W_NO_MISSING_FIELD_INITIALIZERS)
-
-LOCAL_STATIC_LIBRARIES := \
- emulator-libqemu \
- emulator-target-$(EMULATOR_TARGET_CPU) \
- emulator-libjpeg \
- emulator-libelff \
- emulator-common
-
-LOCAL_LDLIBS += \
- $(EMULATOR_COMMON_LDLIBS) \
- $(EMULATOR_LIBQEMU_LDLIBS) \
- $(ELFF_LDLIBS)
-
-LOCAL_SRC_FILES := \
- audio/audio.c \
- disas.c \
- dma-helpers.c \
- gdbstub.c \
- monitor.c \
- qemu-timer.c \
- qemu-timer-common.c \
- vl-android.c \
- android/console.c \
- android/opengles.c \
- android/display-core.c \
- android/protocol/attach-ui-proxy.c \
- android/protocol/fb-updates-proxy.c \
- android/protocol/user-events-impl.c \
- android/protocol/ui-commands-proxy.c \
- android/protocol/core-commands-impl.c \
- android/protocol/core-commands-qemu.c \
- android/user-events-qemu.c \
- hw/core/loader.c \
- ui/keymaps.c \
-
-$(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c)
-$(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c qemu-options.h)
-$(call gen-hw-config-defs)
-
-ifeq ($(HOST_OS),darwin)
- FRAMEWORKS := OpenGL Cocoa QuickTime ApplicationServices Carbon IOKit
- LOCAL_LDLIBS += $(FRAMEWORKS:%=-Wl,-framework,%)
-endif
-
-# Generate a completely static executable if needed.
-# Note that this means no sound and graphics on Linux.
-#
-ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),)
- LOCAL_SRC_FILES += android/dynlink-static.c
- LOCAL_LDLIBS += -static
-endif
-
-# The following files cannot be in static libraries because they contain
-# constructor functions that are otherwise stripped by the final linker
-LOCAL_SRC_FILES += $(HW_OBJ_SOURCES)
-LOCAL_CFLAGS += $(HW_OBJ_CFLAGS)
-
-LOCAL_SRC_FILES += $(BLOCK_SOURCES)
-LOCAL_CFLAGS += $(BLOCK_CFLAGS)
-
-$(call end-emulator-program)
-
##############################################################################
##############################################################################
###
@@ -474,23 +388,21 @@
## another for 64-bit, see note in file Makefile.common emulator64-common
ifneq ($(filter linux darwin,$(HOST_OS)),)
- ifneq ($(BUILD_STANDALONE_EMULATOR),true)
- $(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH))
- LOCAL_STATIC_LIBRARIES += \
- emulator64-libui \
- emulator64-libqemu \
- emulator64-target-$(EMULATOR_TARGET_CPU) \
- emulator64-libjpeg \
- emulator64-libelff \
- emulator64-common \
- $(SDL_STATIC_LIBRARIES_64)
- LOCAL_LDLIBS += $(common_LOCAL_LDLIBS) -m64
- LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
- LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES)
- $(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c)
- $(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c qemu-options.h)
- $(call gen-hw-config-defs)
- $(call end-emulator-program)
- endif # BUILD_STANDALONE_EMULATOR == nil
+ $(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH))
+ LOCAL_STATIC_LIBRARIES += \
+ emulator64-libui \
+ emulator64-libqemu \
+ emulator64-target-$(EMULATOR_TARGET_CPU) \
+ emulator64-libjpeg \
+ emulator64-libelff \
+ emulator64-common \
+ $(SDL_STATIC_LIBRARIES_64)
+ LOCAL_LDLIBS += $(common_LOCAL_LDLIBS) -m64
+ LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
+ LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES)
+ $(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c)
+ $(call gen-hx-header,qemu-options.hx,qemu-options.def,vl-android.c qemu-options.h)
+ $(call gen-hw-config-defs)
+ $(call end-emulator-program)
endif # HOST_OS == linux || darwin