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

Side by Side Diff: build/common.gypi

Issue 216233012: Add whitelist support for grit repack steps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 | build/repack_action.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 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 ['enable_hangout_services_extension==1', { 1888 ['enable_hangout_services_extension==1', {
1889 'grit_defines': ['-D', 'enable_hangout_services_extension'], 1889 'grit_defines': ['-D', 'enable_hangout_services_extension'],
1890 }], 1890 }],
1891 ['enable_task_manager==1', { 1891 ['enable_task_manager==1', {
1892 'grit_defines': ['-D', 'enable_task_manager'], 1892 'grit_defines': ['-D', 'enable_task_manager'],
1893 }], 1893 }],
1894 ['notifications==1', { 1894 ['notifications==1', {
1895 'grit_defines': ['-D', 'enable_notifications'], 1895 'grit_defines': ['-D', 'enable_notifications'],
1896 }], 1896 }],
1897 ['enable_resource_whitelist_generation==1', { 1897 ['enable_resource_whitelist_generation==1', {
1898 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("{textual_ id}") {numeric_id}'], 1898 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'],
1899 }], 1899 }],
1900 ['enable_mdns==1 or OS=="mac"', { 1900 ['enable_mdns==1 or OS=="mac"', {
1901 'grit_defines': ['-D', 'enable_service_discovery'], 1901 'grit_defines': ['-D', 'enable_service_discovery'],
1902 'enable_service_discovery%': 1 1902 'enable_service_discovery%': 1
1903 }], 1903 }],
1904 ['clang_use_chrome_plugins==1 and OS!="win"', { 1904 ['clang_use_chrome_plugins==1 and OS!="win"', {
1905 'clang_chrome_plugins_flags': [ 1905 'clang_chrome_plugins_flags': [
1906 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1906 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1907 ], 1907 ],
1908 }], 1908 }],
(...skipping 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after
5216 # settings in target dicts. SYMROOT is a special case, because many other 5216 # settings in target dicts. SYMROOT is a special case, because many other
5217 # Xcode variables depend on it, including variables such as 5217 # Xcode variables depend on it, including variables such as
5218 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5218 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5219 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5219 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5220 # files to appear (when present) in the UI as actual files and not red 5220 # files to appear (when present) in the UI as actual files and not red
5221 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5221 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5222 # and therefore SYMROOT, needs to be set at the project level. 5222 # and therefore SYMROOT, needs to be set at the project level.
5223 'SYMROOT': '<(DEPTH)/xcodebuild', 5223 'SYMROOT': '<(DEPTH)/xcodebuild',
5224 }, 5224 },
5225 } 5225 }
OLDNEW
« no previous file with comments | « no previous file | build/repack_action.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698