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

Side by Side Diff: content/browser/BUILD.gn

Issue 843583006: GN: Add -Wl,-z defs on linux and fix errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 11 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 | « content/app/BUILD.gn ('k') | content/test/BUILD.gn » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//content/browser/browser.gni") 8 import("//content/browser/browser.gni")
9 import("//media/media_options.gni") 9 import("//media/media_options.gni")
10 10
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ] 257 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
258 } 258 }
259 } 259 }
260 260
261 if (is_linux && use_aura) { 261 if (is_linux && use_aura) {
262 configs += [ "//build/config/linux:fontconfig" ] 262 configs += [ "//build/config/linux:fontconfig" ]
263 } 263 }
264 264
265 if (use_x11) { 265 if (use_x11) {
266 configs += [ "//build/config/linux:x11" ] 266 configs += [ "//build/config/linux:x11" ]
267 deps += [ "//ui/gfx/x" ]
267 } 268 }
268 269
269 # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated 270 # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated
270 # given the interaction between os_chromeos and the feature flags for X11 and 271 # given the interaction between os_chromeos and the feature flags for X11 and
271 # ozone, so do it all in one spot. 272 # ozone, so do it all in one spot.
272 if (is_chromeos || !use_ozone) { 273 if (is_chromeos || !use_ozone) {
273 sources -= [ "power_save_blocker_ozone.cc" ] 274 sources -= [ "power_save_blocker_ozone.cc" ]
274 } 275 }
275 if (is_chromeos || !use_x11) { 276 if (is_chromeos || !use_x11) {
276 sources -= [ "power_save_blocker_x11.cc" ] 277 sources -= [ "power_save_blocker_x11.cc" ]
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 "media/cdm/browser_cdm_manager.h", 436 "media/cdm/browser_cdm_manager.h",
436 "media/media_web_contents_observer.cc", 437 "media/media_web_contents_observer.cc",
437 "media/media_web_contents_observer.h", 438 "media/media_web_contents_observer.h",
438 ] 439 ]
439 } 440 }
440 441
441 if (is_linux && use_openssl) { 442 if (is_linux && use_openssl) {
442 deps += [ "//third_party/boringssl" ] 443 deps += [ "//third_party/boringssl" ]
443 } 444 }
444 } 445 }
OLDNEW
« no previous file with comments | « content/app/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698