am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."

* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
  Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
This commit is contained in:
Jean-Baptiste Queru 2010-11-17 15:27:13 -08:00 committed by Android Git Automerger
commit 766a2a2125

View file

@ -25,7 +25,9 @@ TARGET_AR := $(HOST_AR)
TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32 TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32
TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread
TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS) TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS)
ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
TARGET_ARCH_VARIANT := x86 TARGET_ARCH_VARIANT := x86
endif
else #simulator else #simulator
# Provide a default variant. # Provide a default variant.