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

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: Remove Accidental change 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'use_only_pure_views%': 1, 72 'use_only_pure_views%': 1,
73 }, { 73 }, {
74 'use_only_pure_views%': 0, 74 'use_only_pure_views%': 0,
75 }], 75 }],
76 76
77 # Use the views compositor when using the Aura window manager or 77 # Use the views compositor when using the Aura window manager or
78 # touch. 78 # touch.
79 ['use_aura==1 or touchui==1', { 79 ['use_aura==1 or touchui==1', {
80 'views_compositor%': 1, 80 'views_compositor%': 1,
81 }], 81 }],
82 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS =="android"', {
mattm 2011/10/05 02:27:51 android shouldn't be in this list (in the conditio
mattm 2011/10/05 02:27:51 I'm not sure I understand the gyp stuff that requi
83 'use_nss%': 1,
84 }, {
85 'use_nss%': 0,
86 }],
82 ], 87 ],
83 }, 88 },
84 89
85 # Copy conditionally-set variables out one scope. 90 # Copy conditionally-set variables out one scope.
86 'chromeos%': '<(chromeos)', 91 'chromeos%': '<(chromeos)',
87 'touchui%': '<(touchui)', 92 'touchui%': '<(touchui)',
88 'host_arch%': '<(host_arch)', 93 'host_arch%': '<(host_arch)',
89 'toolkit_views%': '<(toolkit_views)', 94 'toolkit_views%': '<(toolkit_views)',
90 'use_only_pure_views%': '<(use_only_pure_views)', 95 'use_only_pure_views%': '<(use_only_pure_views)',
91 'views_compositor%': '<(views_compositor)', 96 'views_compositor%': '<(views_compositor)',
92 'use_aura%': '<(use_aura)', 97 'use_aura%': '<(use_aura)',
98 'use_nss%': '<(use_nss)',
mattm 2011/10/05 02:27:51 And this could probably go next to use_openssl?
93 99
94 # We used to provide a variable for changing how libraries were built. 100 # We used to provide a variable for changing how libraries were built.
95 # This variable remains until we can clean up all the users. 101 # This variable remains until we can clean up all the users.
96 # This needs to be one nested variables dict in so that dependent 102 # This needs to be one nested variables dict in so that dependent
97 # gyp files can make use of it in their outer variables. (Yikes!) 103 # gyp files can make use of it in their outer variables. (Yikes!)
98 # http://code.google.com/p/chromium/issues/detail?id=83308 104 # http://code.google.com/p/chromium/issues/detail?id=83308
99 'library%': 'static_library', 105 'library%': 'static_library',
100 106
101 # Override branding to select the desired branding flavor. 107 # Override branding to select the desired branding flavor.
102 'branding%': 'Chromium', 108 'branding%': 'Chromium',
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 # Copy conditionally-set variables out one scope. 319 # Copy conditionally-set variables out one scope.
314 'branding%': '<(branding)', 320 'branding%': '<(branding)',
315 'buildtype%': '<(buildtype)', 321 'buildtype%': '<(buildtype)',
316 'target_arch%': '<(target_arch)', 322 'target_arch%': '<(target_arch)',
317 'host_arch%': '<(host_arch)', 323 'host_arch%': '<(host_arch)',
318 'library%': 'static_library', 324 'library%': 'static_library',
319 'toolkit_views%': '<(toolkit_views)', 325 'toolkit_views%': '<(toolkit_views)',
320 'use_only_pure_views%': '<(use_only_pure_views)', 326 'use_only_pure_views%': '<(use_only_pure_views)',
321 'views_compositor%': '<(views_compositor)', 327 'views_compositor%': '<(views_compositor)',
322 'use_aura%': '<(use_aura)', 328 'use_aura%': '<(use_aura)',
329 'use_nss%': '<(use_nss)',
323 'os_posix%': '<(os_posix)', 330 'os_posix%': '<(os_posix)',
324 'use_glib%': '<(use_glib)', 331 'use_glib%': '<(use_glib)',
325 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 332 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
326 'use_skia%': '<(use_skia)', 333 'use_skia%': '<(use_skia)',
327 'use_x11%': '<(use_x11)', 334 'use_x11%': '<(use_x11)',
328 'use_gnome_keyring%': '<(use_gnome_keyring)', 335 'use_gnome_keyring%': '<(use_gnome_keyring)',
329 'linux_fpic%': '<(linux_fpic)', 336 'linux_fpic%': '<(linux_fpic)',
330 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 337 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
331 'chromeos%': '<(chromeos)', 338 'chromeos%': '<(chromeos)',
332 'touchui%': '<(touchui)', 339 'touchui%': '<(touchui)',
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 }], 761 }],
755 ['toolkit_views==1', { 762 ['toolkit_views==1', {
756 'grit_defines': ['-D', 'toolkit_views'], 763 'grit_defines': ['-D', 'toolkit_views'],
757 }], 764 }],
758 ['use_only_pure_views==1', { 765 ['use_only_pure_views==1', {
759 'grit_defines': ['-D', 'use_only_pure_views'], 766 'grit_defines': ['-D', 'use_only_pure_views'],
760 }], 767 }],
761 ['use_aura==1', { 768 ['use_aura==1', {
762 'grit_defines': ['-D', 'use_aura'], 769 'grit_defines': ['-D', 'use_aura'],
763 }], 770 }],
771 ['use_nss==1', {
772 'grit_defines': ['-D', 'use_nss'],
773 }],
764 ['touchui==1', { 774 ['touchui==1', {
765 'grit_defines': ['-D', 'touchui'], 775 'grit_defines': ['-D', 'touchui'],
766 }], 776 }],
767 ['file_manager_extension==1', { 777 ['file_manager_extension==1', {
768 'grit_defines': ['-D', 'file_manager_extension'], 778 'grit_defines': ['-D', 'file_manager_extension'],
769 }], 779 }],
770 ['webui_task_manager==1', { 780 ['webui_task_manager==1', {
771 'grit_defines': ['-D', 'webui_task_manager'], 781 'grit_defines': ['-D', 'webui_task_manager'],
772 }], 782 }],
773 ['remoting==1', { 783 ['remoting==1', {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 }], 895 }],
886 ['use_only_pure_views==1', { 896 ['use_only_pure_views==1', {
887 'defines': ['USE_ONLY_PURE_VIEWS=1'], 897 'defines': ['USE_ONLY_PURE_VIEWS=1'],
888 }], 898 }],
889 ['views_compositor==1', { 899 ['views_compositor==1', {
890 'defines': ['VIEWS_COMPOSITOR=1'], 900 'defines': ['VIEWS_COMPOSITOR=1'],
891 }], 901 }],
892 ['use_aura==1', { 902 ['use_aura==1', {
893 'defines': ['USE_AURA=1'], 903 'defines': ['USE_AURA=1'],
894 }], 904 }],
905 ['use_nss==1', {
906 'defines': ['USE_NSS=1'],
907 }],
895 ['toolkit_uses_gtk==1', { 908 ['toolkit_uses_gtk==1', {
896 'defines': ['TOOLKIT_USES_GTK=1'], 909 'defines': ['TOOLKIT_USES_GTK=1'],
897 }], 910 }],
898 ['chromeos==1', { 911 ['chromeos==1', {
899 'defines': ['OS_CHROMEOS=1'], 912 'defines': ['OS_CHROMEOS=1'],
900 }], 913 }],
901 ['touchui==1', { 914 ['touchui==1', {
902 'defines': ['TOUCH_UI=1'], 915 'defines': ['TOUCH_UI=1'],
903 }], 916 }],
904 ['use_xi2_mt!=0', { 917 ['use_xi2_mt!=0', {
(...skipping 1573 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