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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 62173003: Linux: fix build with gnome-keyring on Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trybots Created 7 years, 1 month 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
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 3060 matching lines...) Expand 10 before | Expand all | Expand 10 after
3071 ['use_cups==1', { 3071 ['use_cups==1', {
3072 'dependencies': [ 3072 'dependencies': [
3073 '../printing/printing.gyp:cups', 3073 '../printing/printing.gyp:cups',
3074 ], 3074 ],
3075 }], 3075 }],
3076 ['use_gnome_keyring==0', { 3076 ['use_gnome_keyring==0', {
3077 'sources!': [ 3077 'sources!': [
3078 'browser/password_manager/native_backend_gnome_x.cc', 3078 'browser/password_manager/native_backend_gnome_x.cc',
3079 'browser/password_manager/native_backend_gnome_x.h', 3079 'browser/password_manager/native_backend_gnome_x.h',
3080 ], 3080 ],
3081 }, {
3082 'dependencies': [
3083 '../build/linux/system.gyp:gnome_keyring',
3084 ],
3081 }], 3085 }],
3082 ['use_aura==1', { 3086 ['use_aura==1', {
3083 'sources/': [ 3087 'sources/': [
3084 ['exclude', '^browser/automation/testing_automation_provider_win.cc' ], 3088 ['exclude', '^browser/automation/testing_automation_provider_win.cc' ],
3085 ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'], 3089 ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'],
3086 ['exclude', '^browser/hang_monitor/hung_plugin_action.h'], 3090 ['exclude', '^browser/hang_monitor/hung_plugin_action.h'],
3087 ['exclude', '^browser/hang_monitor/hung_window_detector.cc'], 3091 ['exclude', '^browser/hang_monitor/hung_window_detector.cc'],
3088 ['exclude', '^browser/hang_monitor/hung_window_detector.h'], 3092 ['exclude', '^browser/hang_monitor/hung_window_detector.h'],
3089 ['exclude', '^browser/icon_loader_linux.cc'], 3093 ['exclude', '^browser/icon_loader_linux.cc'],
3090 ['exclude', '^browser/jumplist_win.cc'], 3094 ['exclude', '^browser/jumplist_win.cc'],
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
3161 ], 3165 ],
3162 'conditions': [ 3166 'conditions': [
3163 ['OS=="linux"', { 3167 ['OS=="linux"', {
3164 'link_settings': { 3168 'link_settings': {
3165 'libraries': [ 3169 'libraries': [
3166 # For dlsym() in 'browser/zygote_main_linux.cc' 3170 # For dlsym() in 'browser/zygote_main_linux.cc'
3167 '-ldl', 3171 '-ldl',
3168 ], 3172 ],
3169 }, 3173 },
3170 }], 3174 }],
3171 ['use_gnome_keyring==1', {
3172 'dependencies': [
3173 '../build/linux/system.gyp:gnome_keyring',
3174 ],
3175 }],
3176 ], 3175 ],
3177 }], 3176 }],
3178 ['input_speech==0', { 3177 ['input_speech==0', {
3179 'sources/': [ 3178 'sources/': [
3180 ['exclude', '^browser/speech/chrome_speech_recognition_manager_deleg ate_bubble_ui'], 3179 ['exclude', '^browser/speech/chrome_speech_recognition_manager_deleg ate_bubble_ui'],
3181 ['exclude', '^browser/speech/speech_recognition_bubble'], 3180 ['exclude', '^browser/speech/speech_recognition_bubble'],
3182 ], 3181 ],
3183 }], 3182 }],
3184 ['notifications==0', { 3183 ['notifications==0', {
3185 'sources/': [ 3184 'sources/': [
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
3775 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3774 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3776 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3775 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3777 }, 3776 },
3778 'includes': [ '../build/android/java_cpp_template.gypi' ], 3777 'includes': [ '../build/android/java_cpp_template.gypi' ],
3779 }, 3778 },
3780 ], 3779 ],
3781 }, 3780 },
3782 ], 3781 ],
3783 ], 3782 ],
3784 } 3783 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698