resolved conflicts for merge of 572d0d7d
to jb-dev-plus-aosp
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
This commit is contained in:
commit
6e207824af
|
@ -104,7 +104,7 @@ TARGET_GLOBAL_CPPFLAGS += \
|
|||
# however, there have been reports that this is sometimes not the case. So make
|
||||
# them explicit here unless we have the time to carefully check it
|
||||
#
|
||||
TARGET_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse
|
||||
TARGET_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32
|
||||
|
||||
# XXX: These flags should not be defined here anymore. Instead, the Android.mk
|
||||
# of the modules that depend on these features should instead check the
|
||||
|
|
Loading…
Reference in New Issue