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

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

Issue 1307173009: rebased ppapi vpnProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: fix compile Created 5 years, 3 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 | « chrome/common/ppapi_utils.cc ('k') | content/browser/renderer_host/pepper/DEPS » ('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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 "udev_linux.cc", 264 "udev_linux.cc",
265 "udev_linux.h", 265 "udev_linux.h",
266 ] 266 ]
267 } 267 }
268 } 268 }
269 269
270 if (enable_plugins) { 270 if (enable_plugins) {
271 sources += rebase_path(content_browser_gypi_values.plugin_browser_sources, 271 sources += rebase_path(content_browser_gypi_values.plugin_browser_sources,
272 ".", 272 ".",
273 "//content") 273 "//content")
274 if (is_chromeos) {
275 sources += rebase_path(
276 content_browser_gypi_values.plugin_browser_chromeos_sources,
277 ".",
278 "//content")
279 }
274 deps += [ 280 deps += [
275 "//ppapi/host", 281 "//ppapi/host",
276 "//ppapi/proxy:ipc", 282 "//ppapi/proxy:ipc",
277 "//ppapi/shared_impl", 283 "//ppapi/shared_impl",
278 ] 284 ]
279 if (!use_ozone || use_pango) { 285 if (!use_ozone || use_pango) {
280 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ] 286 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ]
281 } 287 }
282 if (!use_pango) { 288 if (!use_pango) {
283 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ] 289 sources -= [ "renderer_host/pepper/pepper_truetype_font_list_pango.cc" ]
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 518
513 if (enable_webvr && is_android) { 519 if (enable_webvr && is_android) {
514 sources += [ 520 sources += [
515 "vr/android/cardboard/cardboard_vr_device.cc", 521 "vr/android/cardboard/cardboard_vr_device.cc",
516 "vr/android/cardboard/cardboard_vr_device.h", 522 "vr/android/cardboard/cardboard_vr_device.h",
517 "vr/android/cardboard/cardboard_vr_device_provider.cc", 523 "vr/android/cardboard/cardboard_vr_device_provider.cc",
518 "vr/android/cardboard/cardboard_vr_device_provider.h", 524 "vr/android/cardboard/cardboard_vr_device_provider.h",
519 ] 525 ]
520 } 526 }
521 } 527 }
OLDNEW
« no previous file with comments | « chrome/common/ppapi_utils.cc ('k') | content/browser/renderer_host/pepper/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698