commit 3886905166c6fd3a9c830e71b9f4e8ba63b51593
author Android Chromium Automerger <chromium-automerger@android> Thu Sep 05 12:14:23 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Thu Sep 05 12:14:23 2013 +0000
tree 2adb9ba3acfdac9ef519f0ca2a6806d607a5ae96
parent 44ec58cddd43c7a3cf856ee05b3e11e6d86f9322

Update makefiles after merge of Chromium at r221391

This commit was generated by merge_from_chromium.py.

Change-Id: Ie9e8a3a49a250d83d490b0ef3d6b3a11bcc06e92

ft2.target.darwin-arm.mk

diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index f6f9b00..84805fe 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -94,7 +94,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \
@@ -179,7 +178,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \

ft2.target.darwin-mips.mk

diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 2e554d2..fc965ef 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -94,7 +94,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \
@@ -179,7 +178,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \

ft2.target.darwin-x86.mk

diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index f5d3485..b23d071 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -96,7 +96,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \
@@ -184,7 +183,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \

ft2.target.linux-arm.mk

diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index f6f9b00..84805fe 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -94,7 +94,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \
@@ -179,7 +178,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \

ft2.target.linux-mips.mk

diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 2e554d2..fc965ef 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -94,7 +94,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \
@@ -179,7 +178,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \

ft2.target.linux-x86.mk

diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index f5d3485..b23d071 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -96,7 +96,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \
@@ -184,7 +183,6 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
 	'-DFT2_BUILD_LIBRARY' \
 	'-DDARWIN_NO_CARBON' \
 	'-DANDROID' \