commit 6640bc686069a91a26b475140bf6cfb3884171a2
author Android Chromium Automerger <chromium-automerger@android> Fri Nov 08 12:46:38 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Fri Nov 08 12:46:38 2013 +0000
tree a0b2d05576fab25ae01337ee340db848e727c8db
parent 9cfd065c99f823a09a0902887350d9865a4ba4ac

Update makefiles after merge of Chromium at 233887

This commit was generated by merge_from_chromium.py.

Change-Id: If3a4f6be1aa393c02d20209ae6848974119f7a43

ft2.target.darwin-arm.mk

diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 2b11ca5..83ad9f4 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -55,6 +55,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
@@ -139,6 +140,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \

ft2.target.darwin-mips.mk

diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index d15a0c1..fe45291 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -56,6 +56,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
@@ -140,6 +141,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \

ft2.target.darwin-x86.mk

diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 590bf5c..784577c 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -54,6 +54,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -139,6 +140,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \

ft2.target.linux-arm.mk

diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 2b11ca5..83ad9f4 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -55,6 +55,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \
@@ -139,6 +140,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-fno-tree-sra \
 	-fuse-ld=gold \

ft2.target.linux-mips.mk

diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index d15a0c1..fe45291 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -56,6 +56,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \
@@ -140,6 +141,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-EL \
 	-mhard-float \

ft2.target.linux-x86.mk

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 590bf5c..784577c 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -54,6 +54,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \
@@ -139,6 +140,7 @@
 	-fvisibility=hidden \
 	-pipe \
 	-fPIC \
+	-g \
 	-Wno-format \
 	-m32 \
 	-mmmx \