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

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

Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Created 4 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 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 if (use_external_popup_menu) { 130 if (use_external_popup_menu) {
131 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ] 131 defines += [ "USE_EXTERNAL_POPUP_MENU=1" ]
132 } 132 }
133 if (!enable_nacl) { 133 if (!enable_nacl) {
134 defines += [ "DISABLE_NACL" ] 134 defines += [ "DISABLE_NACL" ]
135 } 135 }
136 if (enable_wayland_server) { 136 if (enable_wayland_server) {
137 defines += [ "ENABLE_WAYLAND_SERVER=1" ] 137 defines += [ "ENABLE_WAYLAND_SERVER=1" ]
138 } 138 }
139 if (proprietary_codecs) {
140 defines += [ "USE_PROPRIETARY_CODECS" ]
141 }
139 if (safe_browsing_mode == 1) { 142 if (safe_browsing_mode == 1) {
140 defines += [ "FULL_SAFE_BROWSING" ] 143 defines += [ "FULL_SAFE_BROWSING" ]
141 defines += [ "SAFE_BROWSING_CSD" ] 144 defines += [ "SAFE_BROWSING_CSD" ]
142 defines += [ "SAFE_BROWSING_DB_LOCAL" ] 145 defines += [ "SAFE_BROWSING_DB_LOCAL" ]
143 } else if (safe_browsing_mode == 2) { 146 } else if (safe_browsing_mode == 2) {
144 defines += [ "SAFE_BROWSING_DB_REMOTE" ] 147 defines += [ "SAFE_BROWSING_DB_REMOTE" ]
145 } 148 }
146 if (is_official_build) { 149 if (is_official_build) {
147 defines += [ "OFFICIAL_BUILD" ] 150 defines += [ "OFFICIAL_BUILD" ]
148 } 151 }
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 # 393 #
391 # TODO(sof): determine VS2015 status and retire the setting from all 394 # TODO(sof): determine VS2015 status and retire the setting from all
392 # precompiled configurations. 395 # precompiled configurations.
393 cflags_c = [ "/wd4206" ] 396 cflags_c = [ "/wd4206" ]
394 } else if (is_mac) { 397 } else if (is_mac) {
395 precompiled_header = "build/precompile.h" 398 precompiled_header = "build/precompile.h"
396 precompiled_source = "//build/precompile.h" 399 precompiled_source = "//build/precompile.h"
397 } 400 }
398 } 401 }
399 } 402 }
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