summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-11-05 21:58:13 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-11-05 21:58:13 +0000
commitc33092207688bc4ec067bf039561036cbcc171d8 (patch)
tree8c1ee2f722f5f5e7cc32ea674e8194fcd45f80fa
parent01ebbf53f57724f4112cb043e262e88e8491bfc2 (diff)
downloadfreetype-c33092207688bc4ec067bf039561036cbcc171d8.tar.gz
Update makefiles after merge of Chromium at 5a645aa13b82
This commit was generated by merge_from_chromium.py. Change-Id: I769ed4b8a29d8594f8ace4d8e7ba04c4e8779d4f
Diffstat
-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-mips64.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-mips64.mk2
-rw-r--r--ft2.target.linux-x86.mk2
-rw-r--r--ft2.target.linux-x86_64.mk2
12 files changed, 24 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 2e81690..31c6db1 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -106,6 +106,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -212,6 +213,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index 8117493..73df4d3 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -95,6 +95,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -189,6 +190,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 144d9bd..88f67dd 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.darwin-mips64.mk b/ft2.target.darwin-mips64.mk
index 144d9bd..88f67dd 100644
--- a/ft2.target.darwin-mips64.mk
+++ b/ft2.target.darwin-mips64.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 344f371..9de9249 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -201,6 +202,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 051a415..f453b6c 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -100,6 +100,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 2e81690..31c6db1 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -106,6 +106,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -212,6 +213,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index 8117493..73df4d3 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -95,6 +95,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -189,6 +190,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 144d9bd..88f67dd 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.linux-mips64.mk b/ft2.target.linux-mips64.mk
index 144d9bd..88f67dd 100644
--- a/ft2.target.linux-mips64.mk
+++ b/ft2.target.linux-mips64.mk
@@ -99,6 +99,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -198,6 +199,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 344f371..9de9249 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -201,6 +202,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 051a415..f453b6c 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -100,6 +100,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 05:19:00 +0000