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

Side by Side Diff: build/common.gypi

Issue 10444060: Use chrome_html structure for shared_resources and options2 page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 6 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 | chrome/browser/resources/chromeos/login/header_bar.css » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 ['branding=="Chrome"', { 1030 ['branding=="Chrome"', {
1031 # TODO(mmoss) The .grd files look for _google_chrome, but for 1031 # TODO(mmoss) The .grd files look for _google_chrome, but for
1032 # consistency they should look for google_chrome_build like C++. 1032 # consistency they should look for google_chrome_build like C++.
1033 'grit_defines': ['-D', '_google_chrome', 1033 'grit_defines': ['-D', '_google_chrome',
1034 '-E', 'CHROMIUM_BUILD=google_chrome'], 1034 '-E', 'CHROMIUM_BUILD=google_chrome'],
1035 }, { 1035 }, {
1036 'grit_defines': ['-D', '_chromium', 1036 'grit_defines': ['-D', '_chromium',
1037 '-E', 'CHROMIUM_BUILD=chromium'], 1037 '-E', 'CHROMIUM_BUILD=chromium'],
1038 }], 1038 }],
1039 ['chromeos==1', { 1039 ['chromeos==1', {
1040 'grit_defines': ['-D', 'chromeos'], 1040 'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'],
1041 }], 1041 }],
1042 ['toolkit_views==1', { 1042 ['toolkit_views==1', {
1043 'grit_defines': ['-D', 'toolkit_views'], 1043 'grit_defines': ['-D', 'toolkit_views'],
1044 }], 1044 }],
1045 ['use_aura==1', { 1045 ['use_aura==1', {
1046 'grit_defines': ['-D', 'use_aura'], 1046 'grit_defines': ['-D', 'use_aura'],
1047 }], 1047 }],
1048 ['use_ash==1', { 1048 ['use_ash==1', {
1049 'grit_defines': ['-D', 'use_ash'], 1049 'grit_defines': ['-D', 'use_ash'],
1050 }], 1050 }],
(...skipping 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after
3112 # settings in target dicts. SYMROOT is a special case, because many other 3112 # settings in target dicts. SYMROOT is a special case, because many other
3113 # Xcode variables depend on it, including variables such as 3113 # Xcode variables depend on it, including variables such as
3114 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3114 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3115 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3115 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3116 # files to appear (when present) in the UI as actual files and not red 3116 # files to appear (when present) in the UI as actual files and not red
3117 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3117 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3118 # and therefore SYMROOT, needs to be set at the project level. 3118 # and therefore SYMROOT, needs to be set at the project level.
3119 'SYMROOT': '<(DEPTH)/xcodebuild', 3119 'SYMROOT': '<(DEPTH)/xcodebuild',
3120 }, 3120 },
3121 } 3121 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/header_bar.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698