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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 244403002: do not require xscrnsaver on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move x11 files to under chromeos==0 Created 6 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 | Annotate | Revision Log
« no previous file with comments | « build/linux/system.gyp ('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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 'browser/icon_loader_mac.mm', 851 'browser/icon_loader_mac.mm',
852 'browser/icon_loader_win.cc', 852 'browser/icon_loader_win.cc',
853 'browser/icon_manager.cc', 853 'browser/icon_manager.cc',
854 'browser/icon_manager.h', 854 'browser/icon_manager.h',
855 'browser/idle.cc', 855 'browser/idle.cc',
856 'browser/idle.h', 856 'browser/idle.h',
857 'browser/idle_android.cc', 857 'browser/idle_android.cc',
858 'browser/idle_chromeos.cc', 858 'browser/idle_chromeos.cc',
859 'browser/idle_linux.cc', 859 'browser/idle_linux.cc',
860 'browser/idle_mac.mm', 860 'browser/idle_mac.mm',
861 'browser/idle_query_x11.cc',
862 'browser/idle_query_x11.h',
863 'browser/idle_win.cc', 861 'browser/idle_win.cc',
864 'browser/image_decoder.cc', 862 'browser/image_decoder.cc',
865 'browser/image_decoder.h', 863 'browser/image_decoder.h',
866 'browser/image_holder.cc', 864 'browser/image_holder.cc',
867 'browser/image_holder.h', 865 'browser/image_holder.h',
868 'browser/importer/external_process_importer_client.cc', 866 'browser/importer/external_process_importer_client.cc',
869 'browser/importer/external_process_importer_client.h', 867 'browser/importer/external_process_importer_client.h',
870 'browser/importer/external_process_importer_host.cc', 868 'browser/importer/external_process_importer_host.cc',
871 'browser/importer/external_process_importer_host.h', 869 'browser/importer/external_process_importer_host.h',
872 'browser/importer/firefox_profile_lock.cc', 870 'browser/importer/firefox_profile_lock.cc',
(...skipping 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after
3058 '../win8/win8.gyp:metro_viewer', 3056 '../win8/win8.gyp:metro_viewer',
3059 ], 3057 ],
3060 }], 3058 }],
3061 ], 3059 ],
3062 }], 3060 }],
3063 ['ui_compositor_image_transport==1', { 3061 ['ui_compositor_image_transport==1', {
3064 'dependencies': [ 3062 'dependencies': [
3065 '../ui/gl/gl.gyp:gl', 3063 '../ui/gl/gl.gyp:gl',
3066 ], 3064 ],
3067 }], 3065 }],
3068 ['use_x11==1', { 3066 ['use_x11==1 and chromeos==0', {
3067 'sources': [
3068 'browser/idle_query_x11.cc',
3069 'browser/idle_query_x11.h',
3070 ],
3069 'dependencies': [ 3071 'dependencies': [
3070 '../build/linux/system.gyp:xscrnsaver', 3072 '../build/linux/system.gyp:xscrnsaver',
3071 ], 3073 ],
3072 }], 3074 }],
3073 ['os_posix == 1 and OS != "mac" and OS != "ios"', { 3075 ['os_posix == 1 and OS != "mac" and OS != "ios"', {
3074 'sources': [ 3076 'sources': [
3075 'app/chrome_breakpad_client.cc', 3077 'app/chrome_breakpad_client.cc',
3076 'app/chrome_breakpad_client.h', 3078 'app/chrome_breakpad_client.h',
3077 ], 3079 ],
3078 'dependencies': [ 3080 'dependencies': [
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
3738 'package_name': 'org/chromium/chrome/browser', 3740 'package_name': 'org/chromium/chrome/browser',
3739 'template_deps': ['browser/android/tab_load_status.h'], 3741 'template_deps': ['browser/android/tab_load_status.h'],
3740 }, 3742 },
3741 'includes': [ '../build/android/java_cpp_template.gypi' ], 3743 'includes': [ '../build/android/java_cpp_template.gypi' ],
3742 }, 3744 },
3743 ], 3745 ],
3744 }, 3746 },
3745 ], 3747 ],
3746 ], 3748 ],
3747 } 3749 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698