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

Side by Side Diff: build/common.gypi

Issue 10166021: fix incremental_chrome_dll shared build on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reformat from a linux machine?? Created 8 years, 8 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/chrome_installer_util.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 # 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 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 'defines': ['GOOGLE_CHROME_BUILD'], 1196 'defines': ['GOOGLE_CHROME_BUILD'],
1197 }, { # else: branding!="Chrome" 1197 }, { # else: branding!="Chrome"
1198 'defines': ['CHROMIUM_BUILD'], 1198 'defines': ['CHROMIUM_BUILD'],
1199 }], 1199 }],
1200 ['branding=="Chrome" and (OS=="win" or OS=="mac")', { 1200 ['branding=="Chrome" and (OS=="win" or OS=="mac")', {
1201 'defines': ['ENABLE_RLZ'], 1201 'defines': ['ENABLE_RLZ'],
1202 }], 1202 }],
1203 ['component=="shared_library"', { 1203 ['component=="shared_library"', {
1204 'defines': ['COMPONENT_BUILD'], 1204 'defines': ['COMPONENT_BUILD'],
1205 }], 1205 }],
1206 ['component=="shared_library" and incremental_chrome_dll==1', {
1207 # TODO(dpranke): We can't incrementally link chrome when
1208 # content is being built as a DLL because chrome links in
1209 # webkit_glue and webkit_glue depends on symbols defined in
1210 # content. We can remove this when we fix glue.
1211 # See http://code.google.com/p/chromium/issues/detail?id=98755 .
1212 'defines': ['COMPILE_CONTENT_STATICALLY'],
1213 }],
1214 ['toolkit_views==1', { 1206 ['toolkit_views==1', {
1215 'defines': ['TOOLKIT_VIEWS=1'], 1207 'defines': ['TOOLKIT_VIEWS=1'],
1216 }], 1208 }],
1217 ['ui_compositor_image_transport==1', { 1209 ['ui_compositor_image_transport==1', {
1218 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1210 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1219 }], 1211 }],
1220 ['use_aura==1', { 1212 ['use_aura==1', {
1221 'defines': ['USE_AURA=1'], 1213 'defines': ['USE_AURA=1'],
1222 }], 1214 }],
1223 ['use_ash==1', { 1215 ['use_ash==1', {
(...skipping 1792 matching lines...) Expand 10 before | Expand all | Expand 10 after
3016 # settings in target dicts. SYMROOT is a special case, because many other 3008 # settings in target dicts. SYMROOT is a special case, because many other
3017 # Xcode variables depend on it, including variables such as 3009 # Xcode variables depend on it, including variables such as
3018 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3010 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3019 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3011 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3020 # files to appear (when present) in the UI as actual files and not red 3012 # files to appear (when present) in the UI as actual files and not red
3021 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3013 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3022 # and therefore SYMROOT, needs to be set at the project level. 3014 # and therefore SYMROOT, needs to be set at the project level.
3023 'SYMROOT': '<(DEPTH)/xcodebuild', 3015 'SYMROOT': '<(DEPTH)/xcodebuild',
3024 }, 3016 },
3025 } 3017 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_installer_util.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698