resolved conflicts for merge of 9b4660a1 to master

Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed
This commit is contained in:
Raphael 2011-03-25 16:21:38 -07:00
commit 2396a0db92
1 changed files with 1 additions and 0 deletions

View File

@ -89,6 +89,7 @@ else
TARGET_GLOBAL_CFLAGS += -march=i686
endif
TARGET_GLOBAL_CFLAGS += -mbionic
TARGET_GLOBAL_CFLAGS += -D__ANDROID__
TARGET_GLOBAL_LDFLAGS += -m32