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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 12965010: Split the libpeerconnection target up in two parts. The new target, libjingle_webrtc contains all t… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « no previous file | content/content_renderer.gypi » ('j') | third_party/libjingle/libjingle.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 2931 matching lines...) Expand 10 before | Expand all | Expand 10 after
2942 'browser/notifications/message_center_settings_controller.h', 2942 'browser/notifications/message_center_settings_controller.h',
2943 ], 2943 ],
2944 }], 2944 }],
2945 ['enable_managed_users!=1', { 2945 ['enable_managed_users!=1', {
2946 'sources/': [ 2946 'sources/': [
2947 ['exclude', '^browser/managed_mode/'], 2947 ['exclude', '^browser/managed_mode/'],
2948 ] 2948 ]
2949 }], 2949 }],
2950 ['enable_webrtc==1', { 2950 ['enable_webrtc==1', {
2951 'dependencies': [ 2951 'dependencies': [
2952 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
2952 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 2953 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
2953 ], 2954 ],
2954 }], 2955 }],
2955 ], 2956 ],
2956 'target_conditions': [ 2957 'target_conditions': [
2957 # Need 'target_conditions' to override default filename_rules to include 2958 # Need 'target_conditions' to override default filename_rules to include
2958 # the files on Android. 2959 # the files on Android.
2959 ['OS=="android"', { 2960 ['OS=="android"', {
2960 'sources/': [ 2961 'sources/': [
2961 ['include', '^app/breakpad_linux\\.cc$'], 2962 ['include', '^app/breakpad_linux\\.cc$'],
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
3119 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3120 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3120 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3121 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3121 }, 3122 },
3122 'includes': [ '../build/android/java_cpp_template.gypi' ], 3123 'includes': [ '../build/android/java_cpp_template.gypi' ],
3123 }, 3124 },
3124 ], 3125 ],
3125 }, 3126 },
3126 ], 3127 ],
3127 ], 3128 ],
3128 } 3129 }
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | third_party/libjingle/libjingle.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698