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

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

Issue 164573002: Revert 251003 "Revert 250830 "Exclude notification strings for b..." (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 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 'cld_version%': 1, 623 'cld_version%': 1,
624 'enable_spellcheck%': 0, 624 'enable_spellcheck%': 0,
625 'enable_themes%': 0, 625 'enable_themes%': 0,
626 'remoting%': 0, 626 'remoting%': 0,
627 'arm_neon%': 0, 627 'arm_neon%': 0,
628 'arm_neon_optional%': 1, 628 'arm_neon_optional%': 1,
629 'native_discardable_memory%': 1, 629 'native_discardable_memory%': 1,
630 'native_memory_pressure_signals%': 1, 630 'native_memory_pressure_signals%': 1,
631 'enable_printing%': 2, 631 'enable_printing%': 2,
632 'enable_task_manager%':0, 632 'enable_task_manager%':0,
633 # Set to 1 once we have a notification system for Android.
634 # http://crbug.com/115320
635 'notifications%': 0,
633 }], 636 }],
634 637
635 # Android OS includes support for proprietary codecs regardless of 638 # Android OS includes support for proprietary codecs regardless of
636 # building Chromium or Google Chrome. We also ship Google Chrome with 639 # building Chromium or Google Chrome. We also ship Google Chrome with
637 # proprietary codecs. 640 # proprietary codecs.
638 ['OS=="android" or branding=="Chrome"', { 641 ['OS=="android" or branding=="Chrome"', {
639 'proprietary_codecs%': 1, 642 'proprietary_codecs%': 1,
640 }, { 643 }, {
641 'proprietary_codecs%': 0, 644 'proprietary_codecs%': 0,
642 }], 645 }],
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 1481
1479 # Disable Native Client. 1482 # Disable Native Client.
1480 'disable_nacl%': 1, 1483 'disable_nacl%': 1,
1481 1484
1482 # Android does not support background apps. 1485 # Android does not support background apps.
1483 'enable_background%': 0, 1486 'enable_background%': 0,
1484 1487
1485 # Sessions are store separately in the Java side. 1488 # Sessions are store separately in the Java side.
1486 'enable_session_service%': 0, 1489 'enable_session_service%': 0,
1487 1490
1488 # Set to 1 once we have a notification system for Android.
1489 # http://crbug.com/115320
1490 'notifications%': 0,
1491
1492 'p2p_apis%' : 0, 1491 'p2p_apis%' : 0,
1493 1492
1494 'gtest_target_type%': 'shared_library', 1493 'gtest_target_type%': 'shared_library',
1495 1494
1496 # Uses system APIs for decoding audio and video. 1495 # Uses system APIs for decoding audio and video.
1497 'use_libffmpeg%': '0', 1496 'use_libffmpeg%': '0',
1498 1497
1499 # When building as part of the Android system, use system libraries 1498 # When building as part of the Android system, use system libraries
1500 # where possible to reduce ROM size. 1499 # where possible to reduce ROM size.
1501 # TODO(steveblock): Investigate using the system version of sqlite. 1500 # TODO(steveblock): Investigate using the system version of sqlite.
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 }], 1791 }],
1793 ['enable_mdns==1', { 1792 ['enable_mdns==1', {
1794 'grit_defines': ['-D', 'enable_mdns'], 1793 'grit_defines': ['-D', 'enable_mdns'],
1795 }], 1794 }],
1796 ['enable_enhanced_bookmarks==1', { 1795 ['enable_enhanced_bookmarks==1', {
1797 'grit_defines': ['-D', 'enable_enhanced_bookmarks'], 1796 'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
1798 }], 1797 }],
1799 ['enable_task_manager==1', { 1798 ['enable_task_manager==1', {
1800 'grit_defines': ['-D', 'enable_task_manager'], 1799 'grit_defines': ['-D', 'enable_task_manager'],
1801 }], 1800 }],
1801 ['notifications==1', {
1802 'grit_defines': ['-D', 'enable_notifications'],
1803 }],
1802 ['clang_use_chrome_plugins==1 and OS!="win"', { 1804 ['clang_use_chrome_plugins==1 and OS!="win"', {
1803 'clang_chrome_plugins_flags': [ 1805 'clang_chrome_plugins_flags': [
1804 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1806 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1805 ], 1807 ],
1806 }], 1808 }],
1807 1809
1808 ['asan==1 and OS!="win"', { 1810 ['asan==1 and OS!="win"', {
1809 'clang%': 1, 1811 'clang%': 1,
1810 }], 1812 }],
1811 ['asan==1 and OS=="mac"', { 1813 ['asan==1 and OS=="mac"', {
(...skipping 3157 matching lines...) Expand 10 before | Expand all | Expand 10 after
4969 # settings in target dicts. SYMROOT is a special case, because many other 4971 # settings in target dicts. SYMROOT is a special case, because many other
4970 # Xcode variables depend on it, including variables such as 4972 # Xcode variables depend on it, including variables such as
4971 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4973 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4972 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4974 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4973 # files to appear (when present) in the UI as actual files and not red 4975 # files to appear (when present) in the UI as actual files and not red
4974 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4976 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4975 # and therefore SYMROOT, needs to be set at the project level. 4977 # and therefore SYMROOT, needs to be set at the project level.
4976 'SYMROOT': '<(DEPTH)/xcodebuild', 4978 'SYMROOT': '<(DEPTH)/xcodebuild',
4977 }, 4979 },
4978 } 4980 }
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