Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: build/config/BUILD.gn

Issue 1524473002: Remove fontconfig. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/fnl/BUILD.gn » ('j') | skia/ports/font_mgr_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILD.gn
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index ec2e4b4bbb532103bddcd427b0e41e2b4e46f7aa..6e9336fa2b82b33ffea491cd403967b19ff13252 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -85,16 +85,12 @@ config("feature_flags") {
defines += [ "ADDRESS_SANITIZER" ]
}
if (is_lsan) {
- defines += [
- "LEAK_SANITIZER",
- "WTF_USE_LEAK_SANITIZER=1",
- ]
+ defines += [ "LEAK_SANITIZER" ]
}
if (is_tsan) {
defines += [
"THREAD_SANITIZER",
"DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1",
- "WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1",
]
}
if (is_msan) {
@@ -122,7 +118,6 @@ config("debug") {
defines = [
"_DEBUG",
"DYNAMIC_ANNOTATIONS_ENABLED=1",
- "WTF_USE_DYNAMIC_ANNOTATIONS=1",
]
if (is_nacl) {
@@ -145,10 +140,7 @@ config("release") {
# TODO(GYP) The GYP build has "release_valgrind_build == 0" for this
# condition. When Valgrind is set up, we need to do the same here.
if (is_tsan) {
- defines += [
- "DYNAMIC_ANNOTATIONS_ENABLED=1",
- "WTF_USE_DYNAMIC_ANNOTATIONS=1",
- ]
+ defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=1" ]
} else {
defines += [ "NVALGRIND" ]
if (!is_nacl) {
« no previous file with comments | « no previous file | build/config/fnl/BUILD.gn » ('j') | skia/ports/font_mgr_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698