diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:46 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 23:51:37 -0700 |
| commit | e33ba4c49ed461d608c65eb4e09d31ca81d167ff (patch) | |
| tree | 1fcc76ec2875c51aa941ebadd70e7609c0faf7c6 /core/combo | |
| parent | 18a298e7bc39310b844e3587345e71495a9f4bb6 (diff) | |
| download | build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.zip build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.tar.gz build-e33ba4c49ed461d608c65eb4e09d31ca81d167ff.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 5 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 15 |
2 files changed, 0 insertions, 20 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index c871613..5ae4972 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -45,13 +45,8 @@ endif # TARGET_PRODUCT == sdk # We build everything in 32-bit, because some host tools are # 32-bit-only anyway (emulator, acc), and because it gives us # more consistency between the host tools and the target. -# The exception is the host side of the simulator, which -# requires to use the default size, as wxWidgets code otherwise -# fails to build. -ifneq ($(TARGET_SIMULATOR),true) HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32 -endif HOST_GLOBAL_CFLAGS += -fPIC HOST_GLOBAL_CFLAGS += \ diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 5a90951..0d05dd2 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -17,19 +17,6 @@ # Configuration for Linux on x86 as a target. # Included by combo/select.mk -ifeq ($(TARGET_SIMULATOR),true) -# When building for the simulator, use the HOST settings as TARGET settings -TARGET_CC := $(HOST_CC) -TARGET_CXX := $(HOST_CXX) -TARGET_AR := $(HOST_AR) -TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32 -TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread -TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS) -ifeq ($(strip $(TARGET_ARCH_VARIANT)),) -TARGET_ARCH_VARIANT := x86 -endif -else #simulator - # Provide a default variant. ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := x86 @@ -204,5 +191,3 @@ $(hide) $(PRIVATE_CXX) \ -Wl,--end-group \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O)) endef - -endif #simulator |