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

Side by Side Diff: build/common.gypi

Issue 8135024: Make use_nss a gyp var so that aura can build w/ nss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: include cert manager if either nss or openssl Created 9 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 'use_virtual_keyboard%': 1, 79 'use_virtual_keyboard%': 1,
80 }, { 80 }, {
81 'use_virtual_keyboard%': 0, 81 'use_virtual_keyboard%': 0,
82 }], 82 }],
83 83
84 # Use the views compositor when using the Aura window manager or 84 # Use the views compositor when using the Aura window manager or
85 # touch. 85 # touch.
86 ['use_aura==1 or touchui==1', { 86 ['use_aura==1 or touchui==1', {
87 'views_compositor%': 1, 87 'views_compositor%': 1,
88 }], 88 }],
89 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
90 'use_nss%': 1,
mattm 2011/10/05 03:44:47 Did you see the question about whether these could
DaveMoore 2011/10/05 04:02:57 Done.
91 }, {
92 'use_nss%': 0,
93 }],
89 ], 94 ],
90 }, 95 },
91 96
92 # Copy conditionally-set variables out one scope. 97 # Copy conditionally-set variables out one scope.
93 'chromeos%': '<(chromeos)', 98 'chromeos%': '<(chromeos)',
94 'touchui%': '<(touchui)', 99 'touchui%': '<(touchui)',
95 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 100 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
96 'host_arch%': '<(host_arch)', 101 'host_arch%': '<(host_arch)',
97 'toolkit_views%': '<(toolkit_views)', 102 'toolkit_views%': '<(toolkit_views)',
98 'use_only_pure_views%': '<(use_only_pure_views)', 103 'use_only_pure_views%': '<(use_only_pure_views)',
99 'views_compositor%': '<(views_compositor)', 104 'views_compositor%': '<(views_compositor)',
100 'use_aura%': '<(use_aura)', 105 'use_aura%': '<(use_aura)',
106 'use_nss%': '<(use_nss)',
101 107
102 # We used to provide a variable for changing how libraries were built. 108 # We used to provide a variable for changing how libraries were built.
103 # This variable remains until we can clean up all the users. 109 # This variable remains until we can clean up all the users.
104 # This needs to be one nested variables dict in so that dependent 110 # This needs to be one nested variables dict in so that dependent
105 # gyp files can make use of it in their outer variables. (Yikes!) 111 # gyp files can make use of it in their outer variables. (Yikes!)
106 # http://code.google.com/p/chromium/issues/detail?id=83308 112 # http://code.google.com/p/chromium/issues/detail?id=83308
107 'library%': 'static_library', 113 'library%': 'static_library',
108 114
109 # Override branding to select the desired branding flavor. 115 # Override branding to select the desired branding flavor.
110 'branding%': 'Chromium', 116 'branding%': 'Chromium',
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 # Copy conditionally-set variables out one scope. 327 # Copy conditionally-set variables out one scope.
322 'branding%': '<(branding)', 328 'branding%': '<(branding)',
323 'buildtype%': '<(buildtype)', 329 'buildtype%': '<(buildtype)',
324 'target_arch%': '<(target_arch)', 330 'target_arch%': '<(target_arch)',
325 'host_arch%': '<(host_arch)', 331 'host_arch%': '<(host_arch)',
326 'library%': 'static_library', 332 'library%': 'static_library',
327 'toolkit_views%': '<(toolkit_views)', 333 'toolkit_views%': '<(toolkit_views)',
328 'use_only_pure_views%': '<(use_only_pure_views)', 334 'use_only_pure_views%': '<(use_only_pure_views)',
329 'views_compositor%': '<(views_compositor)', 335 'views_compositor%': '<(views_compositor)',
330 'use_aura%': '<(use_aura)', 336 'use_aura%': '<(use_aura)',
337 'use_nss%': '<(use_nss)',
331 'os_posix%': '<(os_posix)', 338 'os_posix%': '<(os_posix)',
332 'use_glib%': '<(use_glib)', 339 'use_glib%': '<(use_glib)',
333 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 340 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
334 'use_skia%': '<(use_skia)', 341 'use_skia%': '<(use_skia)',
335 'use_x11%': '<(use_x11)', 342 'use_x11%': '<(use_x11)',
336 'use_gnome_keyring%': '<(use_gnome_keyring)', 343 'use_gnome_keyring%': '<(use_gnome_keyring)',
337 'linux_fpic%': '<(linux_fpic)', 344 'linux_fpic%': '<(linux_fpic)',
338 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 345 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
339 'chromeos%': '<(chromeos)', 346 'chromeos%': '<(chromeos)',
340 'touchui%': '<(touchui)', 347 'touchui%': '<(touchui)',
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 }], 770 }],
764 ['toolkit_views==1', { 771 ['toolkit_views==1', {
765 'grit_defines': ['-D', 'toolkit_views'], 772 'grit_defines': ['-D', 'toolkit_views'],
766 }], 773 }],
767 ['use_only_pure_views==1', { 774 ['use_only_pure_views==1', {
768 'grit_defines': ['-D', 'use_only_pure_views'], 775 'grit_defines': ['-D', 'use_only_pure_views'],
769 }], 776 }],
770 ['use_aura==1', { 777 ['use_aura==1', {
771 'grit_defines': ['-D', 'use_aura'], 778 'grit_defines': ['-D', 'use_aura'],
772 }], 779 }],
780 ['use_nss==1', {
781 'grit_defines': ['-D', 'use_nss'],
782 }],
773 ['touchui==1', { 783 ['touchui==1', {
774 'grit_defines': ['-D', 'touchui'], 784 'grit_defines': ['-D', 'touchui'],
775 }], 785 }],
776 ['use_virtual_keyboard==1', { 786 ['use_virtual_keyboard==1', {
777 'grit_defines': ['-D', 'use_virtual_keyboard'], 787 'grit_defines': ['-D', 'use_virtual_keyboard'],
778 }], 788 }],
779 ['file_manager_extension==1', { 789 ['file_manager_extension==1', {
780 'grit_defines': ['-D', 'file_manager_extension'], 790 'grit_defines': ['-D', 'file_manager_extension'],
781 }], 791 }],
782 ['webui_task_manager==1', { 792 ['webui_task_manager==1', {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 }], 907 }],
898 ['use_only_pure_views==1', { 908 ['use_only_pure_views==1', {
899 'defines': ['USE_ONLY_PURE_VIEWS=1'], 909 'defines': ['USE_ONLY_PURE_VIEWS=1'],
900 }], 910 }],
901 ['views_compositor==1', { 911 ['views_compositor==1', {
902 'defines': ['VIEWS_COMPOSITOR=1'], 912 'defines': ['VIEWS_COMPOSITOR=1'],
903 }], 913 }],
904 ['use_aura==1', { 914 ['use_aura==1', {
905 'defines': ['USE_AURA=1'], 915 'defines': ['USE_AURA=1'],
906 }], 916 }],
917 ['use_nss==1', {
918 'defines': ['USE_NSS=1'],
919 }],
907 ['toolkit_uses_gtk==1', { 920 ['toolkit_uses_gtk==1', {
908 'defines': ['TOOLKIT_USES_GTK=1'], 921 'defines': ['TOOLKIT_USES_GTK=1'],
909 }], 922 }],
910 ['chromeos==1', { 923 ['chromeos==1', {
911 'defines': ['OS_CHROMEOS=1'], 924 'defines': ['OS_CHROMEOS=1'],
912 }], 925 }],
913 ['touchui==1', { 926 ['touchui==1', {
914 'defines': ['TOUCH_UI=1'], 927 'defines': ['TOUCH_UI=1'],
915 }], 928 }],
916 ['use_virtual_keyboard==1', { 929 ['use_virtual_keyboard==1', {
(...skipping 1561 matching lines...) Expand 10 before | Expand all | Expand 10 after
2478 # settings in target dicts. SYMROOT is a special case, because many other 2491 # settings in target dicts. SYMROOT is a special case, because many other
2479 # Xcode variables depend on it, including variables such as 2492 # Xcode variables depend on it, including variables such as
2480 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2493 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2481 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2494 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2482 # files to appear (when present) in the UI as actual files and not red 2495 # files to appear (when present) in the UI as actual files and not red
2483 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2496 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2484 # and therefore SYMROOT, needs to be set at the project level. 2497 # and therefore SYMROOT, needs to be set at the project level.
2485 'SYMROOT': '<(DEPTH)/xcodebuild', 2498 'SYMROOT': '<(DEPTH)/xcodebuild',
2486 }, 2499 },
2487 } 2500 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698