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

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

Issue 2745943002: Remove enable_webvr from build/config, and move it to the buildflag_header system. (Closed)
Patch Set: rebase 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/features.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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 defines += [ "OFFICIAL_BUILD" ] 133 defines += [ "OFFICIAL_BUILD" ]
134 } 134 }
135 if (is_chrome_branded) { 135 if (is_chrome_branded) {
136 defines += [ "GOOGLE_CHROME_BUILD" ] 136 defines += [ "GOOGLE_CHROME_BUILD" ]
137 } else { 137 } else {
138 defines += [ "CHROMIUM_BUILD" ] 138 defines += [ "CHROMIUM_BUILD" ]
139 } 139 }
140 if (enable_media_router) { 140 if (enable_media_router) {
141 defines += [ "ENABLE_MEDIA_ROUTER=1" ] 141 defines += [ "ENABLE_MEDIA_ROUTER=1" ]
142 } 142 }
143 if (enable_webvr) {
144 defines += [ "ENABLE_WEBVR" ]
145 }
146 if (is_syzyasan) { 143 if (is_syzyasan) {
147 defines += [ 144 defines += [
148 "SYZYASAN", 145 "SYZYASAN",
149 "MEMORY_SANITIZER_INITIAL_SIZE", 146 "MEMORY_SANITIZER_INITIAL_SIZE",
150 ] 147 ]
151 } 148 }
152 if (!fieldtrial_testing_like_official_build && !is_chrome_branded) { 149 if (!fieldtrial_testing_like_official_build && !is_chrome_branded) {
153 defines += [ "FIELDTRIAL_TESTING_ENABLED" ] 150 defines += [ "FIELDTRIAL_TESTING_ENABLED" ]
154 } 151 }
155 152
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 # then delete the precompile.c.obj file, then build again. 372 # then delete the precompile.c.obj file, then build again.
376 # 373 #
377 # TODO(sof): determine VS2015 status and retire the setting from all 374 # TODO(sof): determine VS2015 status and retire the setting from all
378 # precompiled configurations. 375 # precompiled configurations.
379 cflags_c = [ "/wd4206" ] 376 cflags_c = [ "/wd4206" ]
380 } else if (is_mac) { 377 } else if (is_mac) {
381 precompiled_source = "//build/precompile.h" 378 precompiled_source = "//build/precompile.h"
382 } 379 }
383 } 380 }
384 } 381 }
OLDNEW
« no previous file with comments | « no previous file | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698