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

Side by Side Diff: build/config/BUILD.gn

Issue 2741783007: Convert ENABLE_WAYLAND_SERVER to a build flag. (Closed)
Patch Set: errrrr Created 3 years, 9 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/allocator.gni") 5 import("//build/config/allocator.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/chromecast_build.gni") 7 import("//build/config/chromecast_build.gni")
8 import("//build/config/crypto.gni") 8 import("//build/config/crypto.gni")
9 import("//build/config/dcheck_always_on.gni") 9 import("//build/config/dcheck_always_on.gni")
10 import("//build/config/features.gni") 10 import("//build/config/features.gni")
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 } 118 }
119 if (is_ubsan || is_ubsan_null || is_ubsan_vptr || is_ubsan_security) { 119 if (is_ubsan || is_ubsan_null || is_ubsan_vptr || is_ubsan_security) {
120 defines += [ "UNDEFINED_SANITIZER" ] 120 defines += [ "UNDEFINED_SANITIZER" ]
121 } 121 }
122 if (use_external_popup_menu) { 122 if (use_external_popup_menu) {
123 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] 123 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ]
124 } 124 }
125 if (!enable_nacl) { 125 if (!enable_nacl) {
126 defines += [ "DISABLE_NACL" ] 126 defines += [ "DISABLE_NACL" ]
127 } 127 }
128 if (enable_wayland_server) {
129 defines += [ "ENABLE_WAYLAND_SERVER=1" ]
130 }
131 if (safe_browsing_mode == 1) { 128 if (safe_browsing_mode == 1) {
132 defines += [ "FULL_SAFE_BROWSING" ] 129 defines += [ "FULL_SAFE_BROWSING" ]
133 defines += [ "SAFE_BROWSING_CSD" ] 130 defines += [ "SAFE_BROWSING_CSD" ]
134 defines += [ "SAFE_BROWSING_DB_LOCAL" ] 131 defines += [ "SAFE_BROWSING_DB_LOCAL" ]
135 } else if (safe_browsing_mode == 2) { 132 } else if (safe_browsing_mode == 2) {
136 defines += [ "SAFE_BROWSING_DB_REMOTE" ] 133 defines += [ "SAFE_BROWSING_DB_REMOTE" ]
137 } 134 }
138 if (is_official_build) { 135 if (is_official_build) {
139 defines += [ "OFFICIAL_BUILD" ] 136 defines += [ "OFFICIAL_BUILD" ]
140 } 137 }
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 # then delete the precompile.c.obj file, then build again. 378 # then delete the precompile.c.obj file, then build again.
382 # 379 #
383 # TODO(sof): determine VS2015 status and retire the setting from all 380 # TODO(sof): determine VS2015 status and retire the setting from all
384 # precompiled configurations. 381 # precompiled configurations.
385 cflags_c = [ "/wd4206" ] 382 cflags_c = [ "/wd4206" ]
386 } else if (is_mac) { 383 } else if (is_mac) {
387 precompiled_source = "//build/precompile.h" 384 precompiled_source = "//build/precompile.h"
388 } 385 }
389 } 386 }
390 } 387 }
OLDNEW
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698