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

Side by Side Diff: extensions/extensions.gyp

Issue 1900233004: [chrome.displaySource] Implement software based H.264 video encoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Rebase Created 4 years, 7 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 | « no previous file | extensions/extensions.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'includes': [ 6 'includes': [
7 'extensions.gypi', 7 'extensions.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 '<@(extensions_browser_sources_wifi_display)', 191 '<@(extensions_browser_sources_wifi_display)',
192 '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/wifi_display_sess ion_service.mojom.cc', 192 '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/wifi_display_sess ion_service.mojom.cc',
193 '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/wifi_display_sess ion_service.mojom.h', 193 '<(SHARED_INTERMEDIATE_DIR)/extensions/common/mojo/wifi_display_sess ion_service.mojom.h',
194 ], 194 ],
195 }], 195 }],
196 ], 196 ],
197 # Disable c4267 warnings until we fix size_t to int truncations. 197 # Disable c4267 warnings until we fix size_t to int truncations.
198 'msvs_disabled_warnings': [ 4267, ], 198 'msvs_disabled_warnings': [ 4267, ],
199 }, 199 },
200 { 200 {
201 # GN version: //extensions/renderer 201 # GN version: //extensions/renderer
hbos_chromium 2016/04/28 09:02:33 Make a similar change to the GN version
e_hakkinen 2016/04/28 13:47:39 Done.
202 'target_name': 'extensions_renderer', 202 'target_name': 'extensions_renderer',
203 'type': 'static_library', 203 'type': 'static_library',
204 'dependencies': [ 204 'dependencies': [
205 'extensions_resources.gyp:extensions_resources', 205 'extensions_resources.gyp:extensions_resources',
206 '../components/components.gyp:guest_view_renderer', 206 '../components/components.gyp:guest_view_renderer',
207 '../content/content.gyp:content_common', 207 '../content/content.gyp:content_common',
208 '../content/content.gyp:content_resources', 208 '../content/content.gyp:content_resources',
209 '../gin/gin.gyp:gin', 209 '../gin/gin.gyp:gin',
210 '../mojo/mojo_public.gyp:mojo_js_bindings', 210 '../mojo/mojo_public.gyp:mojo_js_bindings',
211 '../third_party/WebKit/public/blink.gyp:blink', 211 '../third_party/WebKit/public/blink.gyp:blink',
212 ], 212 ],
213 'include_dirs': [ 213 'include_dirs': [
214 '..', 214 '..',
215 ], 215 ],
216 'sources': [ 216 'sources': [
217 '<@(extensions_renderer_sources)', 217 '<@(extensions_renderer_sources)',
218 ], 218 ],
219 # Disable c4267 warnings until we fix size_t to int truncations. 219 # Disable c4267 warnings until we fix size_t to int truncations.
220 'msvs_disabled_warnings': [ 4267, ], 220 'msvs_disabled_warnings': [ 4267, ],
221 'conditions': [ 221 'conditions': [
222 ['enable_wifi_display==1', { 222 ['enable_wifi_display==1', {
223 'dependencies': [ 223 'dependencies': [
224 '../third_party/wds/wds.gyp:libwds', 224 '../third_party/wds/wds.gyp:libwds',
225 ], 225 ],
226 'sources': [ 226 'sources': [
227 '<@(extensions_renderer_sources_wifi_display)', 227 '<@(extensions_renderer_sources_wifi_display)',
228 ], 228 ],
229 'conditions': [
230 ['use_openh264==1', {
hbos_chromium 2016/04/28 09:02:33 I added the use_openh264 flag so that I could cont
hbos_chromium 2016/04/28 09:22:15 If this does not apply because this is an extensio
e_hakkinen 2016/04/28 13:47:39 The code is not used without an extra flags anyway
hbos_chromium 2016/04/28 14:27:29 There are reasons for why third_party/openh264 is
231 'defines': ['USE_OPENH264=1'],
232 'dependencies': [
233 '../third_party/openh264/openh264.gyp:openh264_encoder',
234 ]
235 }]
236 ]
229 }], 237 }],
230 ], 238 ],
231 }, 239 },
232 { 240 {
233 # GN version: //extensions/utility 241 # GN version: //extensions/utility
234 'target_name': 'extensions_utility', 242 'target_name': 'extensions_utility',
235 'type': 'static_library', 243 'type': 'static_library',
236 'dependencies': [ 244 'dependencies': [
237 '../content/content.gyp:content_common', 245 '../content/content.gyp:content_common',
238 '../content/content.gyp:content_utility', 246 '../content/content.gyp:content_utility',
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak', 327 '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',
320 ], 328 ],
321 'pak_output': '<(PRODUCT_DIR)/extensions_shell_and_test.pak', 329 'pak_output': '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
322 }, 330 },
323 'includes': [ '../build/repack_action.gypi' ], 331 'includes': [ '../build/repack_action.gypi' ],
324 }, 332 },
325 ], 333 ],
326 }, 334 },
327 ] 335 ]
328 } 336 }
OLDNEW
« no previous file with comments | « no previous file | extensions/extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698