summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-07-10 18:45:24 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-07-10 18:45:24 +0000
commitd0d975b7c290905153a6c5e7e0c2cb9516627e04 (patch)
treeb1afdbca5f4e94dca924e54fa55c199e9277c841
parent062c7d9db180ecc98c8aaaacf19d5e05d05ad035 (diff)
downloadfreetype-d0d975b7c290905153a6c5e7e0c2cb9516627e04.tar.gz
Update makefiles after merge of Chromium at 282385
This commit was generated by merge_from_chromium.py. Change-Id: If0fcda12ccedb2f1eff49dee7360b02879daf119
-rw-r--r--ft2.target.darwin-arm.mk2
-rw-r--r--ft2.target.darwin-arm64.mk2
-rw-r--r--ft2.target.darwin-mips.mk2
-rw-r--r--ft2.target.darwin-x86.mk2
-rw-r--r--ft2.target.darwin-x86_64.mk2
-rw-r--r--ft2.target.linux-arm.mk2
-rw-r--r--ft2.target.linux-arm64.mk2
-rw-r--r--ft2.target.linux-mips.mk2
-rw-r--r--ft2.target.linux-x86.mk2
-rw-r--r--ft2.target.linux-x86_64.mk2
10 files changed, 8 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 9a1b7c4..bbdb0e1 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -84,9 +84,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index 3cd5a63..56be399 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -74,7 +74,6 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
-funwind-tables
@@ -178,7 +177,6 @@ MY_CFLAGS_Release := \
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Release := \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 7c84880..f971cca 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 4f4f001..3368bc5 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index a97cd17..7a684d7 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -78,9 +78,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 9a1b7c4..bbdb0e1 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -84,9 +84,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index 3cd5a63..56be399 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -74,7 +74,6 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
-funwind-tables
@@ -178,7 +177,6 @@ MY_CFLAGS_Release := \
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Release := \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 7c84880..f971cca 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 4f4f001..3368bc5 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -79,9 +79,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index a97cd17..7a684d7 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -78,9 +78,9 @@ MY_CFLAGS_Debug := \
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \