Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 "//ppapi/proxy:ipc", | 271 "//ppapi/proxy:ipc", |
| 272 "//ppapi/shared_impl", | 272 "//ppapi/shared_impl", |
| 273 ] | 273 ] |
| 274 if (!use_ozone || use_pango) { | 274 if (!use_ozone || use_pango) { |
| 275 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ] | 275 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ] |
| 276 } | 276 } |
| 277 if (!use_pango) { | 277 if (!use_pango) { |
| 278 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ] | 278 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ] |
| 279 } | 279 } |
| 280 } | 280 } |
| 281 | |
|
Avi (use Gerrit)
2015/07/02 18:25:27
Why are you removing this line? Put it back in.
A
| |
| 282 if (is_linux && use_aura) { | 281 if (is_linux && use_aura) { |
| 283 configs += [ "//build/config/linux:fontconfig" ] | 282 configs += [ "//build/config/linux:fontconfig" ] |
| 284 } | 283 } |
| 285 | 284 |
| 286 if (use_x11) { | 285 if (use_x11) { |
| 287 configs += [ "//build/config/linux:x11" ] | 286 configs += [ "//build/config/linux:x11" ] |
| 288 deps += [ "//ui/gfx/x" ] | 287 deps += [ "//ui/gfx/x" ] |
| 289 } | 288 } |
| 290 | 289 |
| 291 # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated | 290 # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 484 if (enable_webvr) { | 483 if (enable_webvr) { |
| 485 sources += [ | 484 sources += [ |
| 486 "vr/vr_device.cc", | 485 "vr/vr_device.cc", |
| 487 "vr/vr_device.h", | 486 "vr/vr_device.h", |
| 488 "vr/vr_device_manager.cc", | 487 "vr/vr_device_manager.cc", |
| 489 "vr/vr_device_manager.h", | 488 "vr/vr_device_manager.h", |
| 490 "vr/vr_device_provider.h", | 489 "vr/vr_device_provider.h", |
| 491 ] | 490 ] |
| 492 } | 491 } |
| 493 } | 492 } |
| OLD | NEW |