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

Side by Side Diff: chrome/chrome.gyp

Issue 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/chrome_android.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 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 # on 64-bit Windows only. Targets that end with nacl_win64 should be used 97 # on 64-bit Windows only. Targets that end with nacl_win64 should be used
98 # by Native Client only. 98 # by Native Client only.
99 # NOTE: Most new includes should go in the OS!="ios" condition below. 99 # NOTE: Most new includes should go in the OS!="ios" condition below.
100 '../build/chrome_settings.gypi', 100 '../build/chrome_settings.gypi',
101 '../build/util/version.gypi', 101 '../build/util/version.gypi',
102 '../build/win_precompile.gypi', 102 '../build/win_precompile.gypi',
103 'chrome_browser.gypi', 103 'chrome_browser.gypi',
104 'chrome_browser_ui.gypi', 104 'chrome_browser_ui.gypi',
105 'chrome_common.gypi', 105 'chrome_common.gypi',
106 'chrome_installer_util.gypi', 106 'chrome_installer_util.gypi',
107 'chrome_features.gypi',
108 ], 107 ],
109 'conditions': [ 108 'conditions': [
110 ['OS!="ios"', { 109 ['OS!="ios"', {
111 'includes': [ 110 'includes': [
112 '../apps/apps.gypi', 111 '../apps/apps.gypi',
113 'chrome_child.gypi', 112 'chrome_child.gypi',
114 'chrome_debugger.gypi', 113 'chrome_debugger.gypi',
115 'chrome_dll.gypi', 114 'chrome_dll.gypi',
116 'chrome_exe.gypi', 115 'chrome_exe.gypi',
117 'chrome_installer.gypi', 116 'chrome_installer.gypi',
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 '<(DEPTH)/third_party/kasko' 798 '<(DEPTH)/third_party/kasko'
800 ], 799 ],
801 }, 800 },
802 }, 801 },
803 }, 802 },
804 }, 803 },
805 ], 804 ],
806 }], 805 }],
807 ], # 'conditions' 806 ], # 'conditions'
808 } 807 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698