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

Side by Side Diff: content/content_renderer.gypi

Issue 9271028: android build: progress on content and libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify conditional to make work on non-Android Created 8 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/content_browser.gypi ('k') | content/public/browser/browser_context.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'dependencies': [ 6 'dependencies': [
7 '../jingle/jingle.gyp:jingle_glue', 7 '../jingle/jingle.gyp:jingle_glue',
8 '../net/net.gyp:net', 8 '../net/net.gyp:net',
9 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 9 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
10 '../ppapi/ppapi_internal.gyp:ppapi_shared', 10 '../ppapi/ppapi_internal.gyp:ppapi_shared',
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 ['OS=="mac"', { 255 ['OS=="mac"', {
256 'sources!': [ 256 'sources!': [
257 'common/process_watcher_posix.cc', 257 'common/process_watcher_posix.cc',
258 ], 258 ],
259 }], 259 }],
260 ['OS=="win" and win_use_allocator_shim==1', { 260 ['OS=="win" and win_use_allocator_shim==1', {
261 'dependencies': [ 261 'dependencies': [
262 '../base/allocator/allocator.gyp:allocator', 262 '../base/allocator/allocator.gyp:allocator',
263 ], 263 ],
264 }], 264 }],
265 # TODO(jrg): remove the OS=="android" section?
266 # Understand better how media_stream_ is tied into Chromium.
267 ['enable_webrtc==0 and OS=="android"', {
268 'sources/': [
269 ['exclude', '^renderer/media/media_stream_'],
270 ],
271 }],
265 ['enable_webrtc==1', { 272 ['enable_webrtc==1', {
266 'dependencies': [ 273 'dependencies': [
267 '../third_party/webrtc/modules/modules.gyp:video_capture_module', 274 '../third_party/webrtc/modules/modules.gyp:video_capture_module',
268 '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system _wrappers', 275 '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system _wrappers',
269 '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', 276 '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
270 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', 277 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
271 ], 278 ],
272 'sources': [ 279 'sources': [
273 'renderer/media/video_capture_module_impl.cc', 280 'renderer/media/video_capture_module_impl.cc',
274 'renderer/media/video_capture_module_impl.h', 281 'renderer/media/video_capture_module_impl.h',
275 'renderer/media/webrtc_audio_device_impl.cc', 282 'renderer/media/webrtc_audio_device_impl.cc',
276 'renderer/media/webrtc_audio_device_impl.h', 283 'renderer/media/webrtc_audio_device_impl.h',
277 ], 284 ],
278 }], 285 }],
279 ['java_bridge==1', { 286 ['java_bridge==1', {
280 'defines': [ 287 'defines': [
281 'ENABLE_JAVA_BRIDGE', 288 'ENABLE_JAVA_BRIDGE',
282 ], 289 ],
283 }, { 290 }, {
284 'sources!': [ 291 'sources!': [
285 'renderer/java/java_bridge_channel.cc', 292 'renderer/java/java_bridge_channel.cc',
286 'renderer/java/java_bridge_channel.h', 293 'renderer/java/java_bridge_channel.h',
287 'renderer/java/java_bridge_dispatcher.cc', 294 'renderer/java/java_bridge_dispatcher.cc',
288 'renderer/java/java_bridge_dispatcher.h', 295 'renderer/java/java_bridge_dispatcher.h',
289 ], 296 ],
290 }], 297 }],
291 ], 298 ],
292 } 299 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/public/browser/browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698