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

Side by Side Diff: chrome/chrome.gyp

Issue 10260033: Build fixes to get use_aura && !use_ash to build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « chrome/browser/ui/views/stubs_aura.cc ('k') | chrome/chrome_tests.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 (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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 'dependencies': [ 857 'dependencies': [
858 '../base/base.gyp:base_unittests', 858 '../base/base.gyp:base_unittests',
859 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 859 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
860 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 860 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
861 '../content/content.gyp:content_browsertests', 861 '../content/content.gyp:content_browsertests',
862 '../content/content.gyp:content_shell', 862 '../content/content.gyp:content_shell',
863 '../content/content.gyp:content_unittests', 863 '../content/content.gyp:content_unittests',
864 '../net/net.gyp:net_unittests', 864 '../net/net.gyp:net_unittests',
865 '../ui/ui.gyp:ui_unittests', 865 '../ui/ui.gyp:ui_unittests',
866 ], 866 ],
867 'conditions': [
868 ['use_aura==1', {
869 'dependencies!': [
870 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
871 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
872 ],
873 }],
874 ],
867 }, 875 },
868 { 876 {
869 'target_name': 'chrome_version_resources', 877 'target_name': 'chrome_version_resources',
870 'type': 'none', 878 'type': 'none',
871 'dependencies': [ 879 'dependencies': [
872 '../build/util/build_util.gyp:lastchange#target', 880 '../build/util/build_util.gyp:lastchange#target',
873 ], 881 ],
874 'direct_dependent_settings': { 882 'direct_dependent_settings': {
875 'include_dirs': [ 883 'include_dirs': [
876 '<(SHARED_INTERMEDIATE_DIR)/chrome_version', 884 '<(SHARED_INTERMEDIATE_DIR)/chrome_version',
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 'sources': [ 1077 'sources': [
1070 'browser/safe_browsing/signature_util.h', 1078 'browser/safe_browsing/signature_util.h',
1071 'browser/safe_browsing/signature_util_win.cc', 1079 'browser/safe_browsing/signature_util_win.cc',
1072 'tools/safe_browsing/sb_sigutil.cc', 1080 'tools/safe_browsing/sb_sigutil.cc',
1073 ], 1081 ],
1074 }, 1082 },
1075 ]}, # 'targets' 1083 ]}, # 'targets'
1076 ], # OS=="win" 1084 ], # OS=="win"
1077 ], # 'conditions' 1085 ], # 'conditions'
1078 } 1086 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/stubs_aura.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698