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

Side by Side Diff: chrome/chrome_browser.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/common.gypi ('k') | no next file » | 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 4148 matching lines...) Expand 10 before | Expand all | Expand 10 after
4159 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have 4159 # Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
4160 # native certificate viewers). 4160 # native certificate viewers).
4161 ['os_posix == 0 or OS == "mac"', { 4161 ['os_posix == 0 or OS == "mac"', {
4162 'sources/': [ 4162 'sources/': [
4163 ['exclude', '^browser/ui/webui/certificate_viewer.cc'], 4163 ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
4164 ['exclude', '^browser/ui/webui/certificate_viewer.h'], 4164 ['exclude', '^browser/ui/webui/certificate_viewer.h'],
4165 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], 4165 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
4166 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'], 4166 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
4167 ], 4167 ],
4168 }], 4168 }],
4169 ['use_nss==1', {
4170 'sources': [
4171 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
4172 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
4173 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
4174 'third_party/mozilla_security_manager/nsNSSCertificate.h',
4175 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
4176 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
4177 ],
4178 }],
4179 ['use_nss==0 and use_openssl==0', {
4180 'sources!': [
4181 'browser/certificate_manager_model.cc',
4182 'browser/certificate_manager_model.h',
4183 'browser/ui/webui/options/certificate_manager_handler.cc',
4184 'browser/ui/webui/options/certificate_manager_handler.h',
4185 ],
4186 }],
4169 ['toolkit_uses_gtk == 1', { 4187 ['toolkit_uses_gtk == 1', {
4170 'dependencies': [ 4188 'dependencies': [
4171 '../build/linux/system.gyp:dbus', 4189 '../build/linux/system.gyp:dbus',
4172 '../build/linux/system.gyp:gconf', 4190 '../build/linux/system.gyp:gconf',
4173 '../build/linux/system.gyp:gtk', 4191 '../build/linux/system.gyp:gtk',
4174 '../build/linux/system.gyp:gtkprint', 4192 '../build/linux/system.gyp:gtkprint',
4175 '../build/linux/system.gyp:ssl', 4193 '../build/linux/system.gyp:ssl',
4176 '../build/linux/system.gyp:x11', 4194 '../build/linux/system.gyp:x11',
4177 '../dbus/dbus.gyp:dbus', 4195 '../dbus/dbus.gyp:dbus',
4178 '../third_party/undoview/undoview.gyp:undoview', 4196 '../third_party/undoview/undoview.gyp:undoview',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
4212 'include_dirs': [ 4230 'include_dirs': [
4213 # breakpad_linux.cc uses generated file_version_info_linux.h. 4231 # breakpad_linux.cc uses generated file_version_info_linux.h.
4214 '<(SHARED_INTERMEDIATE_DIR)', 4232 '<(SHARED_INTERMEDIATE_DIR)',
4215 '../breakpad/src', 4233 '../breakpad/src',
4216 ], 4234 ],
4217 }, { # linux_breakpad==0 4235 }, { # linux_breakpad==0
4218 'sources': [ 4236 'sources': [
4219 'browser/crash_handler_host_linux_stub.cc', 4237 'browser/crash_handler_host_linux_stub.cc',
4220 ], 4238 ],
4221 }], 4239 }],
4222 ['use_openssl==0', {
4223 'sources': [
4224 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
4225 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
4226 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
4227 'third_party/mozilla_security_manager/nsNSSCertificate.h',
4228 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
4229 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
4230 ],
4231 }],
4232 ],
4233 }, { # toolkit_uses_gtk != 1
4234 'sources!': [
4235 # TODO(mattm): Cert manager stuff is really !USE_NSS.
4236 'browser/certificate_manager_model.cc',
4237 'browser/certificate_manager_model.h',
4238 'browser/ui/webui/options/certificate_manager_handler.cc',
4239 'browser/ui/webui/options/certificate_manager_handler.h',
4240 ], 4240 ],
4241 }], 4241 }],
4242 ['OS=="mac"', { 4242 ['OS=="mac"', {
4243 'sources!': [ 4243 'sources!': [
4244 'browser/automation/automation_provider_list_generic.cc', 4244 'browser/automation/automation_provider_list_generic.cc',
4245 'browser/bookmarks/bookmark_context_menu.cc', 4245 'browser/bookmarks/bookmark_context_menu.cc',
4246 'browser/bookmarks/bookmark_drop_info.cc', 4246 'browser/bookmarks/bookmark_drop_info.cc',
4247 'browser/first_run/upgrade_util.cc', 4247 'browser/first_run/upgrade_util.cc',
4248 'browser/importer/nss_decryptor_system_nss.cc', 4248 'browser/importer/nss_decryptor_system_nss.cc',
4249 'browser/importer/nss_decryptor_system_nss.h', 4249 'browser/importer/nss_decryptor_system_nss.h',
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
4989 ['include', '^browser/crash_handler_host_linux_stub.cc'], 4989 ['include', '^browser/crash_handler_host_linux_stub.cc'],
4990 ['include', '^browser/ui/login/login_prompt_ui.cc'], 4990 ['include', '^browser/ui/login/login_prompt_ui.cc'],
4991 ['include', '^browser/ui/views/aura/aura_init.cc'], 4991 ['include', '^browser/ui/views/aura/aura_init.cc'],
4992 ['include', '^browser/ui/views/browser_bubble_aura.cc'], 4992 ['include', '^browser/ui/views/browser_bubble_aura.cc'],
4993 ['include', '^browser/ui/views/constrained_html_delegate_views.cc'], 4993 ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
4994 ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'], 4994 ['include', '^browser/ui/views/dropdown_bar_host_aura.cc'],
4995 ['include', '^browser/ui/views/frame/browser_frame_aura.cc'], 4995 ['include', '^browser/ui/views/frame/browser_frame_aura.cc'],
4996 ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'] , 4996 ['include', '^browser/ui/views/importer/import_lock_dialog_view.cc'] ,
4997 ['include', '^browser/ui/views/select_file_dialog.cc'], 4997 ['include', '^browser/ui/views/select_file_dialog.cc'],
4998 ['include', '^browser/ui/views/stubs_aura.cc'], 4998 ['include', '^browser/ui/views/stubs_aura.cc'],
4999 ['include', '^browser/ui/webui/options/certificate_manager_handler.c c'],
5000 ], 4999 ],
5001 }], 5000 }],
5002 [ 'use_openssl==1', { 5001 [ 'use_openssl==1', {
5003 'sources!': [ 5002 'sources!': [
5004 'browser/importer/nss_decryptor.cc', 5003 'browser/importer/nss_decryptor.cc',
5005 'browser/importer/nss_decryptor_system_nss.cc', 5004 'browser/importer/nss_decryptor_system_nss.cc',
5006 'browser/importer/nss_decryptor_system_nss.h', 5005 'browser/importer/nss_decryptor_system_nss.h',
5007 'browser/ui/crypto_module_password_dialog_nss.cc', 5006 'browser/ui/crypto_module_password_dialog_nss.cc',
5008 ]}, { 5007 ]}, {
5009 'sources!': [ 5008 'sources!': [
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
5071 'type': 'static_library', 5070 'type': 'static_library',
5072 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5071 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5073 'variables': { 5072 'variables': {
5074 'proto_in_dir': 'browser/history', 5073 'proto_in_dir': 'browser/history',
5075 'proto_out_dir': 'chrome/browser/history', 5074 'proto_out_dir': 'chrome/browser/history',
5076 }, 5075 },
5077 'includes': [ '../build/protoc.gypi' ] 5076 'includes': [ '../build/protoc.gypi' ]
5078 }, 5077 },
5079 ], 5078 ],
5080 } 5079 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698