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

Side by Side Diff: build/common.gypi

Issue 17063004: Adding WebRTC log upload list under chrome://webrtc-logs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 5 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/app/generated_resources.grd » ('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 1562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 }], 1573 }],
1574 ['enable_settings_app==1', { 1574 ['enable_settings_app==1', {
1575 'grit_defines': ['-D', 'enable_settings_app'], 1575 'grit_defines': ['-D', 'enable_settings_app'],
1576 }], 1576 }],
1577 ['enable_google_now==1', { 1577 ['enable_google_now==1', {
1578 'grit_defines': ['-D', 'enable_google_now'], 1578 'grit_defines': ['-D', 'enable_google_now'],
1579 }], 1579 }],
1580 ['use_concatenated_impulse_responses==1', { 1580 ['use_concatenated_impulse_responses==1', {
1581 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 1581 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
1582 }], 1582 }],
1583 ['enable_webrtc==1', {
1584 'grit_defines': ['-D', 'enable_webrtc'],
1585 }],
1583 ['clang_use_chrome_plugins==1 and OS!="win"', { 1586 ['clang_use_chrome_plugins==1 and OS!="win"', {
1584 'clang_chrome_plugins_flags': [ 1587 'clang_chrome_plugins_flags': [
1585 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1588 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1586 ], 1589 ],
1587 }], 1590 }],
1588 1591
1589 ['asan==1 and OS!="win"', { 1592 ['asan==1 and OS!="win"', {
1590 'clang%': 1, 1593 'clang%': 1,
1591 }], 1594 }],
1592 ['asan==1 and OS=="mac"', { 1595 ['asan==1 and OS=="mac"', {
(...skipping 3000 matching lines...) Expand 10 before | Expand all | Expand 10 after
4593 # settings in target dicts. SYMROOT is a special case, because many other 4596 # settings in target dicts. SYMROOT is a special case, because many other
4594 # Xcode variables depend on it, including variables such as 4597 # Xcode variables depend on it, including variables such as
4595 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4598 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4596 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4599 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4597 # files to appear (when present) in the UI as actual files and not red 4600 # files to appear (when present) in the UI as actual files and not red
4598 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4601 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4599 # and therefore SYMROOT, needs to be set at the project level. 4602 # and therefore SYMROOT, needs to be set at the project level.
4600 'SYMROOT': '<(DEPTH)/xcodebuild', 4603 'SYMROOT': '<(DEPTH)/xcodebuild',
4601 }, 4604 },
4602 } 4605 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698