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

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: review corrections 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
« no previous file with comments | « build/build_config.h ('k') | chrome/chrome_browser.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) 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'use_skia%': 1, 244 'use_skia%': 1,
245 }], 245 }],
246 246
247 # A flag for POSIX platforms 247 # A flag for POSIX platforms
248 ['OS=="win"', { 248 ['OS=="win"', {
249 'os_posix%': 0, 249 'os_posix%': 0,
250 }, { 250 }, {
251 'os_posix%': 1, 251 'os_posix%': 1,
252 }], 252 }],
253 253
254 # NSS usage.
255 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
256 'use_nss%': 1,
257 }, {
258 'use_nss%': 0,
259 }],
260
254 # Flags to use X11 on non-Mac POSIX platforms 261 # Flags to use X11 on non-Mac POSIX platforms
255 ['OS=="win" or OS=="mac" or OS=="android"', { 262 ['OS=="win" or OS=="mac" or OS=="android"', {
256 'use_glib%': 0, 263 'use_glib%': 0,
257 'toolkit_uses_gtk%': 0, 264 'toolkit_uses_gtk%': 0,
258 'use_x11%': 0, 265 'use_x11%': 0,
259 }, { 266 }, {
260 # TODO(dnicoara) Wayland build should have these disabled, but 267 # TODO(dnicoara) Wayland build should have these disabled, but
261 # currently GTK and X is too spread and it's hard to completely 268 # currently GTK and X is too spread and it's hard to completely
262 # remove every dependency. 269 # remove every dependency.
263 'use_glib%': 1, 270 'use_glib%': 1,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 # Copy conditionally-set variables out one scope. 328 # Copy conditionally-set variables out one scope.
322 'branding%': '<(branding)', 329 'branding%': '<(branding)',
323 'buildtype%': '<(buildtype)', 330 'buildtype%': '<(buildtype)',
324 'target_arch%': '<(target_arch)', 331 'target_arch%': '<(target_arch)',
325 'host_arch%': '<(host_arch)', 332 'host_arch%': '<(host_arch)',
326 'library%': 'static_library', 333 'library%': 'static_library',
327 'toolkit_views%': '<(toolkit_views)', 334 'toolkit_views%': '<(toolkit_views)',
328 'use_only_pure_views%': '<(use_only_pure_views)', 335 'use_only_pure_views%': '<(use_only_pure_views)',
329 'views_compositor%': '<(views_compositor)', 336 'views_compositor%': '<(views_compositor)',
330 'use_aura%': '<(use_aura)', 337 'use_aura%': '<(use_aura)',
338 'use_nss%': '<(use_nss)',
331 'os_posix%': '<(os_posix)', 339 'os_posix%': '<(os_posix)',
332 'use_glib%': '<(use_glib)', 340 'use_glib%': '<(use_glib)',
333 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 341 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
334 'use_skia%': '<(use_skia)', 342 'use_skia%': '<(use_skia)',
335 'use_x11%': '<(use_x11)', 343 'use_x11%': '<(use_x11)',
336 'use_gnome_keyring%': '<(use_gnome_keyring)', 344 'use_gnome_keyring%': '<(use_gnome_keyring)',
337 'linux_fpic%': '<(linux_fpic)', 345 'linux_fpic%': '<(linux_fpic)',
338 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 346 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
339 'chromeos%': '<(chromeos)', 347 'chromeos%': '<(chromeos)',
340 'touchui%': '<(touchui)', 348 'touchui%': '<(touchui)',
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 }], 771 }],
764 ['toolkit_views==1', { 772 ['toolkit_views==1', {
765 'grit_defines': ['-D', 'toolkit_views'], 773 'grit_defines': ['-D', 'toolkit_views'],
766 }], 774 }],
767 ['use_only_pure_views==1', { 775 ['use_only_pure_views==1', {
768 'grit_defines': ['-D', 'use_only_pure_views'], 776 'grit_defines': ['-D', 'use_only_pure_views'],
769 }], 777 }],
770 ['use_aura==1', { 778 ['use_aura==1', {
771 'grit_defines': ['-D', 'use_aura'], 779 'grit_defines': ['-D', 'use_aura'],
772 }], 780 }],
781 ['use_nss==1', {
782 'grit_defines': ['-D', 'use_nss'],
783 }],
773 ['touchui==1', { 784 ['touchui==1', {
774 'grit_defines': ['-D', 'touchui'], 785 'grit_defines': ['-D', 'touchui'],
775 }], 786 }],
776 ['use_virtual_keyboard==1', { 787 ['use_virtual_keyboard==1', {
777 'grit_defines': ['-D', 'use_virtual_keyboard'], 788 'grit_defines': ['-D', 'use_virtual_keyboard'],
778 }], 789 }],
779 ['file_manager_extension==1', { 790 ['file_manager_extension==1', {
780 'grit_defines': ['-D', 'file_manager_extension'], 791 'grit_defines': ['-D', 'file_manager_extension'],
781 }], 792 }],
782 ['webui_task_manager==1', { 793 ['webui_task_manager==1', {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 }], 908 }],
898 ['use_only_pure_views==1', { 909 ['use_only_pure_views==1', {
899 'defines': ['USE_ONLY_PURE_VIEWS=1'], 910 'defines': ['USE_ONLY_PURE_VIEWS=1'],
900 }], 911 }],
901 ['views_compositor==1', { 912 ['views_compositor==1', {
902 'defines': ['VIEWS_COMPOSITOR=1'], 913 'defines': ['VIEWS_COMPOSITOR=1'],
903 }], 914 }],
904 ['use_aura==1', { 915 ['use_aura==1', {
905 'defines': ['USE_AURA=1'], 916 'defines': ['USE_AURA=1'],
906 }], 917 }],
918 ['use_nss==1', {
919 'defines': ['USE_NSS=1'],
920 }],
907 ['toolkit_uses_gtk==1', { 921 ['toolkit_uses_gtk==1', {
908 'defines': ['TOOLKIT_USES_GTK=1'], 922 'defines': ['TOOLKIT_USES_GTK=1'],
909 }], 923 }],
910 ['chromeos==1', { 924 ['chromeos==1', {
911 'defines': ['OS_CHROMEOS=1'], 925 'defines': ['OS_CHROMEOS=1'],
912 }], 926 }],
913 ['touchui==1', { 927 ['touchui==1', {
914 'defines': ['TOUCH_UI=1'], 928 'defines': ['TOUCH_UI=1'],
915 }], 929 }],
916 ['use_virtual_keyboard==1', { 930 ['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 2492 # settings in target dicts. SYMROOT is a special case, because many other
2479 # Xcode variables depend on it, including variables such as 2493 # Xcode variables depend on it, including variables such as
2480 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2494 # 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 2495 # 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 2496 # 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, 2497 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2484 # and therefore SYMROOT, needs to be set at the project level. 2498 # and therefore SYMROOT, needs to be set at the project level.
2485 'SYMROOT': '<(DEPTH)/xcodebuild', 2499 'SYMROOT': '<(DEPTH)/xcodebuild',
2486 }, 2500 },
2487 } 2501 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698