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

Side by Side Diff: build/common.gypi

Issue 24891002: Initial WebUI extension for enhanced bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 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/browser_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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 # Platform natively supports discardable memory. 438 # Platform natively supports discardable memory.
439 'native_discardable_memory%': 0, 439 'native_discardable_memory%': 0,
440 440
441 # Platform sends memory pressure signals natively. 441 # Platform sends memory pressure signals natively.
442 'native_memory_pressure_signals%': 0, 442 'native_memory_pressure_signals%': 0,
443 443
444 'spdy_proxy_auth_origin%' : '', 444 'spdy_proxy_auth_origin%' : '',
445 'spdy_proxy_auth_property%' : '', 445 'spdy_proxy_auth_property%' : '',
446 'spdy_proxy_auth_value%' : '', 446 'spdy_proxy_auth_value%' : '',
447 'enable_mdns%' : 0, 447 'enable_mdns%' : 0,
448 'enable_enhanced_bookmarks%': 0,
448 449
449 'conditions': [ 450 'conditions': [
450 # A flag for POSIX platforms 451 # A flag for POSIX platforms
451 ['OS=="win"', { 452 ['OS=="win"', {
452 'os_posix%': 0, 453 'os_posix%': 0,
453 }, { 454 }, {
454 'os_posix%': 1, 455 'os_posix%': 1,
455 }], 456 }],
456 457
457 # A flag for BSD platforms 458 # A flag for BSD platforms
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 'google_api_key%': '<(google_api_key)', 889 'google_api_key%': '<(google_api_key)',
889 'google_default_client_id%': '<(google_default_client_id)', 890 'google_default_client_id%': '<(google_default_client_id)',
890 'google_default_client_secret%': '<(google_default_client_secret)', 891 'google_default_client_secret%': '<(google_default_client_secret)',
891 'enable_managed_users%': '<(enable_managed_users)', 892 'enable_managed_users%': '<(enable_managed_users)',
892 'native_discardable_memory%': '<(native_discardable_memory)', 893 'native_discardable_memory%': '<(native_discardable_memory)',
893 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 894 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
894 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 895 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
895 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 896 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
896 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 897 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
897 'enable_mdns%' : '<(enable_mdns)', 898 'enable_mdns%' : '<(enable_mdns)',
899 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
898 'v8_optimized_debug': '<(v8_optimized_debug)', 900 'v8_optimized_debug': '<(v8_optimized_debug)',
899 'proprietary_codecs%': '<(proprietary_codecs)', 901 'proprietary_codecs%': '<(proprietary_codecs)',
900 902
901 # Use system nspr instead of the bundled one. 903 # Use system nspr instead of the bundled one.
902 'use_system_nspr%': 0, 904 'use_system_nspr%': 0,
903 905
904 # Use system protobuf instead of bundled one. 906 # Use system protobuf instead of bundled one.
905 'use_system_protobuf%': 0, 907 'use_system_protobuf%': 0,
906 908
907 # Use system yasm instead of bundled one. 909 # Use system yasm instead of bundled one.
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
1642 }], 1644 }],
1643 ['use_concatenated_impulse_responses==1', { 1645 ['use_concatenated_impulse_responses==1', {
1644 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 1646 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
1645 }], 1647 }],
1646 ['enable_webrtc==1', { 1648 ['enable_webrtc==1', {
1647 'grit_defines': ['-D', 'enable_webrtc'], 1649 'grit_defines': ['-D', 'enable_webrtc'],
1648 }], 1650 }],
1649 ['enable_mdns==1', { 1651 ['enable_mdns==1', {
1650 'grit_defines': ['-D', 'enable_mdns'], 1652 'grit_defines': ['-D', 'enable_mdns'],
1651 }], 1653 }],
1654 ['enable_enhanced_bookmarks==1', {
1655 'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
1656 }],
1652 ['clang_use_chrome_plugins==1 and OS!="win"', { 1657 ['clang_use_chrome_plugins==1 and OS!="win"', {
1653 'clang_chrome_plugins_flags': [ 1658 'clang_chrome_plugins_flags': [
1654 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1659 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1655 ], 1660 ],
1656 }], 1661 }],
1657 1662
1658 ['asan==1 and OS!="win"', { 1663 ['asan==1 and OS!="win"', {
1659 'clang%': 1, 1664 'clang%': 1,
1660 }], 1665 }],
1661 ['asan==1 and OS=="mac"', { 1666 ['asan==1 and OS=="mac"', {
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
2332 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], 2337 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
2333 }], 2338 }],
2334 ['spdy_proxy_auth_property != ""', { 2339 ['spdy_proxy_auth_property != ""', {
2335 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2340 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2336 }], 2341 }],
2337 ['spdy_proxy_auth_value != ""', { 2342 ['spdy_proxy_auth_value != ""', {
2338 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2343 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2339 }], 2344 }],
2340 ['enable_mdns==1', { 2345 ['enable_mdns==1', {
2341 'defines': ['ENABLE_MDNS=1'], 2346 'defines': ['ENABLE_MDNS=1'],
2347 }],
2348 ['enable_enhanced_bookmarks==1', {
2349 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'],
2342 }] 2350 }]
2343 ], # conditions for 'target_defaults' 2351 ], # conditions for 'target_defaults'
2344 'target_conditions': [ 2352 'target_conditions': [
2345 ['enable_wexit_time_destructors==1', { 2353 ['enable_wexit_time_destructors==1', {
2346 'conditions': [ 2354 'conditions': [
2347 [ 'clang==1', { 2355 [ 'clang==1', {
2348 'cflags': [ 2356 'cflags': [
2349 '-Wexit-time-destructors', 2357 '-Wexit-time-destructors',
2350 ], 2358 ],
2351 'xcode_settings': { 2359 'xcode_settings': {
(...skipping 2382 matching lines...) Expand 10 before | Expand all | Expand 10 after
4734 # settings in target dicts. SYMROOT is a special case, because many other 4742 # settings in target dicts. SYMROOT is a special case, because many other
4735 # Xcode variables depend on it, including variables such as 4743 # Xcode variables depend on it, including variables such as
4736 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4737 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4745 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4738 # files to appear (when present) in the UI as actual files and not red 4746 # files to appear (when present) in the UI as actual files and not red
4739 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4747 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4740 # and therefore SYMROOT, needs to be set at the project level. 4748 # and therefore SYMROOT, needs to be set at the project level.
4741 'SYMROOT': '<(DEPTH)/xcodebuild', 4749 'SYMROOT': '<(DEPTH)/xcodebuild',
4742 }, 4750 },
4743 } 4751 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698