diff options
| author | Raphael <raphael@google.com> | 2011-03-25 15:13:55 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2011-03-25 15:13:55 -0700 |
| commit | 9b4660a1c6edae915c39261bc3d1a3f3696075c4 (patch) | |
| tree | a3fd45402544fdc43584175b26f5281d3fe65dd0 /core/combo/TARGET_linux-x86.mk | |
| parent | 27c782bfcdbec689fc7d195fe485e6f2c623e7cf (diff) | |
| parent | db0d59d1b4a02816832d330c0bfa86ee67f2776e (diff) | |
| download | build-9b4660a1c6edae915c39261bc3d1a3f3696075c4.zip build-9b4660a1c6edae915c39261bc3d1a3f3696075c4.tar.gz build-9b4660a1c6edae915c39261bc3d1a3f3696075c4.tar.bz2 | |
resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index b0cc80c..25f8aec 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -89,6 +89,7 @@ else TARGET_GLOBAL_CFLAGS += -march=i686 endif +TARGET_GLOBAL_CFLAGS += -mbionic TARGET_GLOBAL_CFLAGS += -D__ANDROID__ TARGET_GLOBAL_LDFLAGS += -m32 |