From b48ef4fe0cb1cde4cbdb2aeedc8e932e7443ce57 Mon Sep 17 00:00:00 2001
From: Android Chromium Automerger <chromium-automerger@android>
Date: Fri, 21 Feb 2014 23:58:49 +0000
Subject: Update makefiles after merge of Chromium at 252692

This commit was generated by merge_from_chromium.py.

Change-Id: I251000b0ea69dc69a414770ce2059af0bc0d4cd0
---
 ft2.target.linux-x86.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ft2.target.linux-x86.mk')

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 7499368..d97c3bc 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -233,6 +233,7 @@ LOCAL_CPPFLAGS_Release := \
 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 := \
-- 
cgit v1.2.3