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

Side by Side Diff: build/common.gypi

Issue 8570024: Enable content component (again!). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak audio exports Created 9 years, 1 month 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_exe.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 }, 953 },
954 'conditions': [ 954 'conditions': [
955 ['branding=="Chrome"', { 955 ['branding=="Chrome"', {
956 'defines': ['GOOGLE_CHROME_BUILD'], 956 'defines': ['GOOGLE_CHROME_BUILD'],
957 }, { # else: branding!="Chrome" 957 }, { # else: branding!="Chrome"
958 'defines': ['CHROMIUM_BUILD'], 958 'defines': ['CHROMIUM_BUILD'],
959 }], 959 }],
960 ['component=="shared_library"', { 960 ['component=="shared_library"', {
961 'defines': ['COMPONENT_BUILD'], 961 'defines': ['COMPONENT_BUILD'],
962 }], 962 }],
963 ['component=="shared_library" and incremental_chrome_dll==1', {
964 'defines': ['COMPILE_CONTENT_STATICALLY'],
965 }],
963 ['toolkit_views==1', { 966 ['toolkit_views==1', {
964 'defines': ['TOOLKIT_VIEWS=1'], 967 'defines': ['TOOLKIT_VIEWS=1'],
965 }], 968 }],
966 ['views_compositor==1', { 969 ['views_compositor==1', {
967 'defines': ['VIEWS_COMPOSITOR=1'], 970 'defines': ['VIEWS_COMPOSITOR=1'],
968 }], 971 }],
969 ['ui_compositor_image_transport==1', { 972 ['ui_compositor_image_transport==1', {
970 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 973 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
971 }], 974 }],
972 ['use_webkit_compositor==1', { 975 ['use_webkit_compositor==1', {
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
2614 # settings in target dicts. SYMROOT is a special case, because many other 2617 # settings in target dicts. SYMROOT is a special case, because many other
2615 # Xcode variables depend on it, including variables such as 2618 # Xcode variables depend on it, including variables such as
2616 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2619 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2617 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2620 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2618 # files to appear (when present) in the UI as actual files and not red 2621 # files to appear (when present) in the UI as actual files and not red
2619 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2622 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2620 # and therefore SYMROOT, needs to be set at the project level. 2623 # and therefore SYMROOT, needs to be set at the project level.
2621 'SYMROOT': '<(DEPTH)/xcodebuild', 2624 'SYMROOT': '<(DEPTH)/xcodebuild',
2622 }, 2625 },
2623 } 2626 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698