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

Side by Side Diff: trunk/src/build/common.gypi

Issue 163713002: Revert 250830 "Exclude notification strings for builds that dont..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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 | trunk/src/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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 'cld_version%': 1, 609 'cld_version%': 1,
610 'enable_spellcheck%': 0, 610 'enable_spellcheck%': 0,
611 'enable_themes%': 0, 611 'enable_themes%': 0,
612 'remoting%': 0, 612 'remoting%': 0,
613 'arm_neon%': 0, 613 'arm_neon%': 0,
614 'arm_neon_optional%': 1, 614 'arm_neon_optional%': 1,
615 'native_discardable_memory%': 1, 615 'native_discardable_memory%': 1,
616 'native_memory_pressure_signals%': 1, 616 'native_memory_pressure_signals%': 1,
617 'enable_printing%': 2, 617 'enable_printing%': 2,
618 'enable_task_manager%':0, 618 'enable_task_manager%':0,
619 # Set to 1 once we have a notification system for Android.
620 # http://crbug.com/115320
621 'notifications%': 0,
622 }], 619 }],
623 620
624 # Android OS includes support for proprietary codecs regardless of 621 # Android OS includes support for proprietary codecs regardless of
625 # building Chromium or Google Chrome. We also ship Google Chrome with 622 # building Chromium or Google Chrome. We also ship Google Chrome with
626 # proprietary codecs. 623 # proprietary codecs.
627 ['OS=="android" or branding=="Chrome"', { 624 ['OS=="android" or branding=="Chrome"', {
628 'proprietary_codecs%': 1, 625 'proprietary_codecs%': 1,
629 }, { 626 }, {
630 'proprietary_codecs%': 0, 627 'proprietary_codecs%': 0,
631 }], 628 }],
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
1459 1456
1460 # Disable Native Client. 1457 # Disable Native Client.
1461 'disable_nacl%': 1, 1458 'disable_nacl%': 1,
1462 1459
1463 # Android does not support background apps. 1460 # Android does not support background apps.
1464 'enable_background%': 0, 1461 'enable_background%': 0,
1465 1462
1466 # Sessions are store separately in the Java side. 1463 # Sessions are store separately in the Java side.
1467 'enable_session_service%': 0, 1464 'enable_session_service%': 0,
1468 1465
1466 # Set to 1 once we have a notification system for Android.
1467 # http://crbug.com/115320
1468 'notifications%': 0,
1469
1469 'p2p_apis%' : 0, 1470 'p2p_apis%' : 0,
1470 1471
1471 'gtest_target_type%': 'shared_library', 1472 'gtest_target_type%': 'shared_library',
1472 1473
1473 # Uses system APIs for decoding audio and video. 1474 # Uses system APIs for decoding audio and video.
1474 'use_libffmpeg%': '0', 1475 'use_libffmpeg%': '0',
1475 1476
1476 # When building as part of the Android system, use system libraries 1477 # When building as part of the Android system, use system libraries
1477 # where possible to reduce ROM size. 1478 # where possible to reduce ROM size.
1478 # TODO(steveblock): Investigate using the system version of sqlite. 1479 # TODO(steveblock): Investigate using the system version of sqlite.
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1763 }], 1764 }],
1764 ['enable_mdns==1', { 1765 ['enable_mdns==1', {
1765 'grit_defines': ['-D', 'enable_mdns'], 1766 'grit_defines': ['-D', 'enable_mdns'],
1766 }], 1767 }],
1767 ['enable_enhanced_bookmarks==1', { 1768 ['enable_enhanced_bookmarks==1', {
1768 'grit_defines': ['-D', 'enable_enhanced_bookmarks'], 1769 'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
1769 }], 1770 }],
1770 ['enable_task_manager==1', { 1771 ['enable_task_manager==1', {
1771 'grit_defines': ['-D', 'enable_task_manager'], 1772 'grit_defines': ['-D', 'enable_task_manager'],
1772 }], 1773 }],
1773 ['notifications==1', {
1774 'grit_defines': ['-D', 'enable_notifications'],
1775 }],
1776 ['clang_use_chrome_plugins==1 and OS!="win"', { 1774 ['clang_use_chrome_plugins==1 and OS!="win"', {
1777 'clang_chrome_plugins_flags': [ 1775 'clang_chrome_plugins_flags': [
1778 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1776 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1779 ], 1777 ],
1780 }], 1778 }],
1781 1779
1782 ['asan==1 and OS!="win"', { 1780 ['asan==1 and OS!="win"', {
1783 'clang%': 1, 1781 'clang%': 1,
1784 }], 1782 }],
1785 ['asan==1 and OS=="mac"', { 1783 ['asan==1 and OS=="mac"', {
(...skipping 3127 matching lines...) Expand 10 before | Expand all | Expand 10 after
4913 # settings in target dicts. SYMROOT is a special case, because many other 4911 # settings in target dicts. SYMROOT is a special case, because many other
4914 # Xcode variables depend on it, including variables such as 4912 # Xcode variables depend on it, including variables such as
4915 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4913 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4916 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4914 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4917 # files to appear (when present) in the UI as actual files and not red 4915 # files to appear (when present) in the UI as actual files and not red
4918 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4916 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4919 # and therefore SYMROOT, needs to be set at the project level. 4917 # and therefore SYMROOT, needs to be set at the project level.
4920 'SYMROOT': '<(DEPTH)/xcodebuild', 4918 'SYMROOT': '<(DEPTH)/xcodebuild',
4921 }, 4919 },
4922 } 4920 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698