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: content/renderer/BUILD.gn

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase 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 | « content/content_tests.gypi ('k') | content/renderer/media/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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/renderer/renderer.gni") 7 import("//content/renderer/renderer.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 9
10 source_set("renderer") { 10 source_set("renderer") {
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 if (enable_plugins) { 162 if (enable_plugins) {
163 sources += rebase_path( 163 sources += rebase_path(
164 content_renderer_gypi_values.private_renderer_plugin_sources, 164 content_renderer_gypi_values.private_renderer_plugin_sources,
165 ".", 165 ".",
166 "//content") 166 "//content")
167 deps += [ 167 deps += [
168 "//ppapi/host", 168 "//ppapi/host",
169 "//ppapi/proxy", 169 "//ppapi/proxy",
170 "//ppapi/shared_impl", 170 "//ppapi/shared_impl",
171 "//third_party/libvpx", 171 "//third_party/libvpx_new",
172 "//third_party/libyuv", 172 "//third_party/libyuv",
173 ] 173 ]
174 } 174 }
175 175
176 if (enable_plugins && enable_webrtc) { 176 if (enable_plugins && enable_webrtc) {
177 sources += rebase_path( 177 sources += rebase_path(
178 content_renderer_gypi_values.private_renderer_plugin_webrtc_sources, 178 content_renderer_gypi_values.private_renderer_plugin_webrtc_sources,
179 ".", 179 ".",
180 "//content") 180 "//content")
181 } 181 }
(...skipping 27 matching lines...) Expand all
209 209
210 if (enable_webvr) { 210 if (enable_webvr) {
211 sources += [ 211 sources += [
212 "vr/vr_dispatcher.cc", 212 "vr/vr_dispatcher.cc",
213 "vr/vr_dispatcher.h", 213 "vr/vr_dispatcher.h",
214 "vr/vr_type_converters.cc", 214 "vr/vr_type_converters.cc",
215 "vr/vr_type_converters.h", 215 "vr/vr_type_converters.h",
216 ] 216 ]
217 } 217 }
218 } 218 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698