am 87f50000: merge from open-source master

Merge commit '87f500004acc7b68745bd939a473dd92e77b5c9c'

* commit '87f500004acc7b68745bd939a473dd92e77b5c9c':
  Define __ANDROID__ for x86 to be on par with ARM build requirements
This commit is contained in:
The Android Open Source Project 2010-07-12 14:58:50 -07:00 committed by Android Git Automerger
commit c1b24549e3
1 changed files with 1 additions and 1 deletions

View File

@ -159,7 +159,7 @@ $(TARGET_CXX) \
$(TARGET_CRTEND_O)
endef
TARGET_GLOBAL_CFLAGS += -m32
TARGET_GLOBAL_CFLAGS += -m32 -D__ANDROID__
TARGET_GLOBAL_LDFLAGS += -m32
endif #simulator