commit b48ef4fe0cb1cde4cbdb2aeedc8e932e7443ce57
author Android Chromium Automerger <chromium-automerger@android> Fri Feb 21 23:58:49 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Fri Feb 21 23:58:49 2014 +0000
tree fe808bf6d59d830dc581d0ee15627761bd186761
parent 8c14a93fb15049305837987066b945ccaab14dd1

Update makefiles after merge of Chromium at 252692

This commit was generated by merge_from_chromium.py.

Change-Id: I251000b0ea69dc69a414770ce2059af0bc0d4cd0

ft2.target.darwin-mips.mk

diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index adf74b0..3c51669 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -231,6 +231,7 @@
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
 ### Rules for final target.
 
 LOCAL_LDFLAGS_Debug := \