| Index: crypto/crypto.gyp
|
| ===================================================================
|
| --- crypto/crypto.gyp (revision 79901)
|
| +++ crypto/crypto.gyp (working copy)
|
| @@ -3,428 +3,19 @@
|
| # found in the LICENSE file.
|
|
|
| {
|
| - 'target_defaults': {
|
| - 'variables': {
|
| - 'base_target': 0,
|
| - },
|
| - 'target_conditions': [
|
| - # This part is shared between the targets defined below.
|
| - ['base_target==1', {
|
| - 'sources': [
|
| - '../build/build_config.h',
|
| - 'third_party/dmg_fp/dmg_fp.h',
|
| - 'third_party/dmg_fp/g_fmt.cc',
|
| - 'third_party/dmg_fp/dtoa_wrapper.cc',
|
| - 'third_party/icu/icu_utf.cc',
|
| - 'third_party/icu/icu_utf.h',
|
| - 'third_party/nspr/prtime.cc',
|
| - 'third_party/nspr/prtime.h',
|
| - 'at_exit.cc',
|
| - 'at_exit.h',
|
| - 'atomic_ref_count.h',
|
| - 'atomic_sequence_num.h',
|
| - 'atomicops.h',
|
| - 'atomicops_internals_x86_gcc.cc',
|
| - 'atomicops_internals_x86_msvc.h',
|
| - 'base_api.h',
|
| - 'base_paths.cc',
|
| - 'base_paths.h',
|
| - 'base_paths_mac.h',
|
| - 'base_paths_mac.mm',
|
| - 'base_paths_linux.cc',
|
| - 'base_paths_win.cc',
|
| - 'base_paths_win.h',
|
| - 'basictypes.h',
|
| - 'bind.h',
|
| - 'bind_helpers.h',
|
| - 'bind_internal.h',
|
| - 'bind_internal_win.h',
|
| - 'bits.h',
|
| - 'bzip2_error_handler.cc',
|
| - 'callback.h',
|
| - 'callback_internal.cc',
|
| - 'callback_internal.h',
|
| - 'callback_old.h',
|
| - 'command_line.cc',
|
| - 'command_line.h',
|
| - 'compiler_specific.h',
|
| - 'cpu.cc',
|
| - 'cpu.h',
|
| - 'debug/debug_on_start_win.cc',
|
| - 'debug/debug_on_start_win.h',
|
| - 'debug/debugger.cc',
|
| - 'debug/debugger.h',
|
| - 'debug/debugger_posix.cc',
|
| - 'debug/debugger_win.cc',
|
| - 'debug/leak_annotations.h',
|
| - 'debug/leak_tracker.h',
|
| - 'debug/profiler.cc',
|
| - 'debug/profiler.h',
|
| - 'debug/stack_trace.cc',
|
| - 'debug/stack_trace.h',
|
| - 'debug/stack_trace_posix.cc',
|
| - 'debug/stack_trace_win.cc',
|
| - 'debug/trace_event_win.cc',
|
| - 'debug/trace_event.cc',
|
| - 'debug/trace_event.h',
|
| - 'dir_reader_fallback.h',
|
| - 'dir_reader_linux.h',
|
| - 'dir_reader_posix.h',
|
| - 'environment.cc',
|
| - 'environment.h',
|
| - 'file_path.cc',
|
| - 'file_path.h',
|
| - 'file_util.cc',
|
| - 'file_util.h',
|
| - 'file_util_deprecated.h',
|
| - 'file_util_linux.cc',
|
| - 'file_util_mac.mm',
|
| - 'file_util_posix.cc',
|
| - 'file_util_win.cc',
|
| - 'file_util_proxy.cc',
|
| - 'file_util_proxy.h',
|
| - 'file_version_info.h',
|
| - 'file_version_info_mac.h',
|
| - 'file_version_info_mac.mm',
|
| - 'file_version_info_win.cc',
|
| - 'file_version_info_win.h',
|
| - 'fix_wp64.h',
|
| - 'float_util.h',
|
| - 'foundation_utils_mac.h',
|
| - 'global_descriptors_posix.cc',
|
| - 'global_descriptors_posix.h',
|
| - 'gtest_prod_util.h',
|
| - 'hash_tables.h',
|
| - 'id_map.h',
|
| - 'json/json_reader.cc',
|
| - 'json/json_reader.h',
|
| - 'json/json_writer.cc',
|
| - 'json/json_writer.h',
|
| - 'json/string_escape.cc',
|
| - 'json/string_escape.h',
|
| - 'lazy_instance.cc',
|
| - 'lazy_instance.h',
|
| - 'linked_list.h',
|
| - 'logging.cc',
|
| - 'logging.h',
|
| - 'logging_win.cc',
|
| - 'logging_win.h',
|
| - 'mac/cocoa_protocols.h',
|
| - 'mac/foundation_util.h',
|
| - 'mac/foundation_util.mm',
|
| - 'mac/mac_util.h',
|
| - 'mac/mac_util.mm',
|
| - 'mac/os_crash_dumps.cc',
|
| - 'mac/os_crash_dumps.h',
|
| - 'mac/scoped_aedesc.h',
|
| - 'mac/scoped_cftyperef.h',
|
| - 'mac/scoped_nsautorelease_pool.h',
|
| - 'mac/scoped_nsautorelease_pool.mm',
|
| - 'mach_ipc_mac.h',
|
| - 'mach_ipc_mac.mm',
|
| - 'memory/linked_ptr.h',
|
| - 'memory/memory_debug.cc',
|
| - 'memory/memory_debug.h',
|
| - 'memory/raw_scoped_refptr_mismatch_checker.h',
|
| - 'memory/ref_counted.cc',
|
| - 'memory/ref_counted.h',
|
| - 'memory/ref_counted_memory.cc',
|
| - 'memory/ref_counted_memory.h',
|
| - 'memory/scoped_callback_factory.h',
|
| - 'memory/scoped_handle.h',
|
| - 'memory/scoped_native_library.cc',
|
| - 'memory/scoped_native_library.h',
|
| - 'memory/scoped_nsobject.h',
|
| - 'memory/scoped_open_process.h',
|
| - 'memory/scoped_ptr.h',
|
| - 'memory/scoped_temp_dir.cc',
|
| - 'memory/scoped_temp_dir.h',
|
| - 'memory/scoped_vector.h',
|
| - 'memory/singleton.h',
|
| - 'memory/weak_ptr.cc',
|
| - 'memory/weak_ptr.h',
|
| - 'message_loop.cc',
|
| - 'message_loop.h',
|
| - 'message_loop_proxy.cc',
|
| - 'message_loop_proxy.h',
|
| - 'message_loop_proxy_impl.cc',
|
| - 'message_loop_proxy_impl.h',
|
| - 'message_pump.cc',
|
| - 'message_pump.h',
|
| - 'message_pump_default.cc',
|
| - 'message_pump_default.h',
|
| - 'message_pump_win.cc',
|
| - 'message_pump_win.h',
|
| - 'metrics/histogram.cc',
|
| - 'metrics/histogram.h',
|
| - 'metrics/nacl_histogram.cc',
|
| - 'metrics/nacl_histogram.h',
|
| - 'metrics/stats_counters.cc',
|
| - 'metrics/stats_counters.h',
|
| - 'metrics/stats_table.cc',
|
| - 'metrics/stats_table.h',
|
| - 'mime_util.h',
|
| - 'mime_util_xdg.cc',
|
| - 'native_library.h',
|
| - 'native_library_linux.cc',
|
| - 'native_library_mac.mm',
|
| - 'native_library_win.cc',
|
| - 'observer_list.h',
|
| - 'observer_list_threadsafe.h',
|
| - 'path_service.cc',
|
| - 'path_service.h',
|
| - 'pickle.cc',
|
| - 'pickle.h',
|
| - 'platform_file.cc',
|
| - 'platform_file.h',
|
| - 'platform_file_posix.cc',
|
| - 'platform_file_win.cc',
|
| - 'port.h',
|
| - 'process.h',
|
| - 'process_linux.cc',
|
| - 'process_posix.cc',
|
| - 'process_util.cc',
|
| - 'process_util.h',
|
| - 'process_util_linux.cc',
|
| - 'process_util_mac.mm',
|
| - 'process_util_posix.cc',
|
| - 'process_util_win.cc',
|
| - 'process_win.cc',
|
| - 'rand_util.cc',
|
| - 'rand_util.h',
|
| - 'rand_util_posix.cc',
|
| - 'rand_util_win.cc',
|
| - 'resource_util.cc',
|
| - 'resource_util.h',
|
| - 'safe_strerror_posix.cc',
|
| - 'safe_strerror_posix.h',
|
| - 'scoped_ptr.h',
|
| - 'sha1.h',
|
| - 'sha1_portable.cc',
|
| - 'sha1_win.cc',
|
| - 'shared_memory.h',
|
| - 'shared_memory_posix.cc',
|
| - 'shared_memory_win.cc',
|
| - 'spin_wait.h',
|
| - 'stack_container.h',
|
| - 'stl_util-inl.h',
|
| - 'string_number_conversions.cc',
|
| - 'string_number_conversions.h',
|
| - 'string_piece.cc',
|
| - 'string_piece.h',
|
| - 'string_split.cc',
|
| - 'string_split.h',
|
| - 'string_tokenizer.h',
|
| - 'string_util.cc',
|
| - 'string_util.h',
|
| - 'string_util_win.h',
|
| - 'stringize_macros.h',
|
| - 'stringprintf.cc',
|
| - 'stringprintf.h',
|
| - 'synchronization/cancellation_flag.cc',
|
| - 'synchronization/cancellation_flag.h',
|
| - 'synchronization/condition_variable.h',
|
| - 'synchronization/condition_variable_posix.cc',
|
| - 'synchronization/condition_variable_win.cc',
|
| - 'synchronization/lock.cc',
|
| - 'synchronization/lock.h',
|
| - 'synchronization/lock_impl.h',
|
| - 'synchronization/lock_impl_posix.cc',
|
| - 'synchronization/lock_impl_win.cc',
|
| - 'synchronization/waitable_event.h',
|
| - 'synchronization/waitable_event_posix.cc',
|
| - 'synchronization/waitable_event_watcher.h',
|
| - 'synchronization/waitable_event_watcher_posix.cc',
|
| - 'synchronization/waitable_event_watcher_win.cc',
|
| - 'synchronization/waitable_event_win.cc',
|
| - 'sys_info.h',
|
| - 'sys_info_chromeos.cc',
|
| - 'sys_info_freebsd.cc',
|
| - 'sys_info_linux.cc',
|
| - 'sys_info_mac.cc',
|
| - 'sys_info_openbsd.cc',
|
| - 'sys_info_posix.cc',
|
| - 'sys_info_win.cc',
|
| - 'sys_string_conversions.h',
|
| - 'sys_string_conversions_linux.cc',
|
| - 'sys_string_conversions_mac.mm',
|
| - 'sys_string_conversions_win.cc',
|
| - 'task.cc',
|
| - 'task.h',
|
| - 'task_queue.cc',
|
| - 'task_queue.h',
|
| - 'template_util.h',
|
| - 'threading/non_thread_safe.h',
|
| - 'threading/non_thread_safe_impl.cc',
|
| - 'threading/non_thread_safe_impl.h',
|
| - 'threading/platform_thread.h',
|
| - 'threading/platform_thread_mac.mm',
|
| - 'threading/platform_thread_posix.cc',
|
| - 'threading/platform_thread_win.cc',
|
| - 'threading/simple_thread.cc',
|
| - 'threading/simple_thread.h',
|
| - 'threading/thread.cc',
|
| - 'threading/thread.h',
|
| - 'threading/thread_checker.h',
|
| - 'threading/thread_checker_impl.cc',
|
| - 'threading/thread_checker_impl.h',
|
| - 'threading/thread_collision_warner.cc',
|
| - 'threading/thread_collision_warner.h',
|
| - 'threading/thread_local.h',
|
| - 'threading/thread_local_posix.cc',
|
| - 'threading/thread_local_storage.h',
|
| - 'threading/thread_local_storage_posix.cc',
|
| - 'threading/thread_local_storage_win.cc',
|
| - 'threading/thread_local_win.cc',
|
| - 'threading/thread_restrictions.h',
|
| - 'threading/thread_restrictions.cc',
|
| - 'threading/watchdog.cc',
|
| - 'threading/watchdog.h',
|
| - 'threading/worker_pool.h',
|
| - 'threading/worker_pool_posix.cc',
|
| - 'threading/worker_pool_posix.h',
|
| - 'threading/worker_pool_win.cc',
|
| - 'time.cc',
|
| - 'time.h',
|
| - 'time_win.cc',
|
| - 'timer.cc',
|
| - 'timer.h',
|
| - 'tracked.cc',
|
| - 'tracked.h',
|
| - 'tracked_objects.cc',
|
| - 'tracked_objects.h',
|
| - 'tuple.h',
|
| - 'utf_offset_string_conversions.cc',
|
| - 'utf_offset_string_conversions.h',
|
| - 'utf_string_conversion_utils.cc',
|
| - 'utf_string_conversion_utils.h',
|
| - 'utf_string_conversions.cc',
|
| - 'utf_string_conversions.h',
|
| - 'values.cc',
|
| - 'values.h',
|
| - 'value_conversions.cc',
|
| - 'value_conversions.h',
|
| - 'version.cc',
|
| - 'version.h',
|
| - 'vlog.cc',
|
| - 'vlog.h',
|
| - 'win/event_trace_consumer.h',
|
| - 'win/event_trace_controller.cc',
|
| - 'win/event_trace_controller.h',
|
| - 'win/event_trace_provider.cc',
|
| - 'win/event_trace_provider.h',
|
| - 'win/i18n.cc',
|
| - 'win/i18n.h',
|
| - 'win/object_watcher.cc',
|
| - 'win/object_watcher.h',
|
| - 'win/registry.cc',
|
| - 'win/registry.h',
|
| - 'win/scoped_bstr.cc',
|
| - 'win/scoped_bstr.h',
|
| - 'win/scoped_comptr.h',
|
| - 'win/scoped_gdi_object.h',
|
| - 'win/scoped_handle.h',
|
| - 'win/scoped_hdc.h',
|
| - 'win/scoped_hglobal.h',
|
| - 'win/scoped_variant.cc',
|
| - 'win/scoped_variant.h',
|
| - 'win/win_util.cc',
|
| - 'win/win_util.h',
|
| - 'win/windows_version.cc',
|
| - 'win/windows_version.h',
|
| - 'win/wrapped_window_proc.cc',
|
| - 'win/wrapped_window_proc.h',
|
| - 'nix/xdg_util.h',
|
| - 'nix/xdg_util.cc',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - # These warnings are needed for the files in third_party\dmg_fp.
|
| - 'msvs_disabled_warnings': [
|
| - 4244, 4554, 4018, 4102,
|
| - ],
|
| - 'mac_framework_dirs': [
|
| - '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
|
| - ],
|
| - 'conditions': [
|
| - [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
|
| - 'sources/': [
|
| - ['exclude', '^nix/'],
|
| - ],
|
| - 'sources!': [
|
| - 'atomicops_internals_x86_gcc.cc',
|
| - 'message_pump_glib.cc',
|
| - 'message_pump_glib_x.cc',
|
| - ],
|
| - }],
|
| - [ 'OS != "linux"', {
|
| - 'sources!': [
|
| - # Not automatically excluded by the *linux.cc rules.
|
| - 'gtk_util.cc',
|
| - 'gtk_util.h',
|
| - 'linux_util.cc',
|
| - ],
|
| - },
|
| - ],
|
| - [ 'OS != "mac"', {
|
| - 'sources!': [
|
| - 'scoped_aedesc.h'
|
| - ],
|
| - }],
|
| - # For now, just test the *BSD platforms enough to exclude them.
|
| - # Subsequent changes will include them further.
|
| - [ 'OS != "freebsd"', {
|
| - 'sources/': [ ['exclude', '_freebsd\\.cc$'] ],
|
| - },
|
| - ],
|
| - [ 'OS != "openbsd"', {
|
| - 'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
|
| - },
|
| - ],
|
| - ['OS != "win"', {
|
| - 'sources/': [ ['exclude', '^win/'] ],
|
| - },
|
| - ],
|
| - [ 'OS == "win"', {
|
| - 'include_dirs': [
|
| - '<(DEPTH)/third_party/wtl/include',
|
| - ],
|
| - 'sources!': [
|
| - 'event_recorder_stubs.cc',
|
| - 'file_descriptor_shuffle.cc',
|
| - 'message_pump_libevent.cc',
|
| - # Not using sha1_win.cc because it may have caused a
|
| - # regression to page cycler moz.
|
| - 'sha1_win.cc',
|
| - 'string16.cc',
|
| - 'debug/trace_event.cc',
|
| - ],
|
| - },],
|
| - ],
|
| - }],
|
| - ],
|
| + 'variables': {
|
| + 'chromium_code': 1,
|
| },
|
| 'targets': [
|
| {
|
| - 'target_name': 'base',
|
| + 'target_name': 'crypto',
|
| 'type': '<(library)',
|
| - 'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
|
| - 'variables': {
|
| - 'base_target': 1,
|
| - },
|
| 'dependencies': [
|
| - 'base_static',
|
| - '../third_party/modp_b64/modp_b64.gyp:modp_b64',
|
| - 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| + '../base/base.gyp:base',
|
| ],
|
| - # TODO(gregoryd): direct_dependent_settings should be shared with the
|
| - # 64-bit target, but it doesn't work due to a bug in gyp
|
| - 'direct_dependent_settings': {
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - },
|
| + 'msvs_disabled_warnings': [
|
| + 4018,
|
| + ],
|
| 'conditions': [
|
| [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
|
| 'conditions': [
|
| @@ -432,17 +23,6 @@
|
| 'sources/': [ ['include', '_chromeos\\.cc$'] ]
|
| },
|
| ],
|
| - [ 'linux_use_tcmalloc==0', {
|
| - 'defines': [
|
| - 'NO_TCMALLOC',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'NO_TCMALLOC',
|
| - ],
|
| - },
|
| - },
|
| - ],
|
| [ 'use_openssl==1', {
|
| 'dependencies': [
|
| '../third_party/openssl/openssl.gyp:openssl',
|
| @@ -460,26 +40,8 @@
|
| }
|
| ],
|
| ],
|
| - 'dependencies': [
|
| - 'symbolize',
|
| - '../build/util/build_util.gyp:lastchange',
|
| - '../build/linux/system.gyp:gtk',
|
| - '../build/linux/system.gyp:x11',
|
| - 'xdg_mime',
|
| - ],
|
| - 'defines': [
|
| - 'USE_SYMBOLIZE',
|
| - ],
|
| - 'cflags': [
|
| - '-Wno-write-strings',
|
| - ],
|
| - 'export_dependent_settings': [
|
| - '../build/linux/system.gyp:gtk',
|
| - '../build/linux/system.gyp:x11',
|
| - ],
|
| }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
|
| 'sources/': [
|
| - ['exclude', '/xdg_user_dirs/'],
|
| ['exclude', '_nss\.cc$'],
|
| ],
|
| }],
|
| @@ -491,33 +53,18 @@
|
| },
|
| },
|
| ],
|
| - [ 'OS == "linux"', {
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - # We need rt for clock_gettime().
|
| - '-lrt',
|
| - # For 'native_library_linux.cc'
|
| - '-ldl',
|
| - ],
|
| - },
|
| - }],
|
| [ 'OS == "mac"', {
|
| 'link_settings': {
|
| 'libraries': [
|
| - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
|
| - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
|
| - '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
|
| - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
|
| - '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
|
| '$(SDKROOT)/System/Library/Frameworks/Security.framework',
|
| ],
|
| },
|
| }, { # OS != "mac"
|
| 'sources!': [
|
| - 'crypto/cssm_init.cc',
|
| - 'crypto/cssm_init.h',
|
| - 'crypto/mac_security_services_lock.cc',
|
| - 'crypto/mac_security_services_lock.h',
|
| + 'cssm_init.cc',
|
| + 'cssm_init.h',
|
| + 'mac_security_services_lock.cc',
|
| + 'mac_security_services_lock.h',
|
| ],
|
| }],
|
| [ 'OS == "mac" or OS == "win"', {
|
| @@ -526,37 +73,28 @@
|
| ],
|
| },],
|
| [ 'OS != "win"', {
|
| - 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
|
| 'sources!': [
|
| - 'third_party/purify/pure_api.c',
|
| - 'base_drag_source.cc',
|
| - 'base_drop_target.cc',
|
| - 'crypto/capi_util.h',
|
| - 'crypto/capi_util.cc',
|
| - 'event_recorder.cc',
|
| - 'file_version_info.cc',
|
| - 'registry.cc',
|
| - 'resource_util.cc',
|
| - 'win_util.cc',
|
| + 'capi_util.h',
|
| + 'capi_util.cc',
|
| ],
|
| },],
|
| [ 'use_openssl==1', {
|
| # TODO(joth): Use a glob to match exclude patterns once the
|
| # OpenSSL file set is complete.
|
| 'sources!': [
|
| - 'crypto/encryptor_nss.cc',
|
| - 'crypto/rsa_private_key_nss.cc',
|
| - 'crypto/secure_hash_default.cc',
|
| - 'crypto/signature_creator_nss.cc',
|
| - 'crypto/signature_verifier_nss.cc',
|
| - 'crypto/symmetric_key_nss.cc',
|
| + 'encryptor_nss.cc',
|
| 'hmac_nss.cc',
|
| 'nss_util.cc',
|
| 'nss_util.h',
|
| + 'rsa_private_key_nss.cc',
|
| + 'secure_hash_default.cc',
|
| # Note that sha2.cc depends on the NSS files bundled into
|
| # chromium; it does not have the _nss postfix as it is required
|
| # on platforms besides linux and *bsd.
|
| 'sha2.cc',
|
| + 'signature_creator_nss.cc',
|
| + 'signature_verifier_nss.cc',
|
| + 'symmetric_key_nss.cc',
|
| 'third_party/nss/blapi.h',
|
| 'third_party/nss/blapit.h',
|
| 'third_party/nss/sha256.h',
|
| @@ -564,203 +102,131 @@
|
| ],
|
| }, {
|
| 'sources!': [
|
| - 'crypto/encryptor_openssl.cc',
|
| - 'crypto/rsa_private_key_openssl.cc',
|
| - 'crypto/secure_hash_openssl.cc',
|
| - 'crypto/signature_creator_openssl.cc',
|
| - 'crypto/signature_verifier_openssl.cc',
|
| - 'crypto/symmetric_key_openssl.cc',
|
| + 'encryptor_openssl.cc',
|
| 'hmac_openssl.cc',
|
| 'openssl_util.cc',
|
| 'openssl_util.h',
|
| + 'rsa_private_key_openssl.cc',
|
| + 'secure_hash_openssl.cc',
|
| 'sha2_openssl.cc',
|
| + 'signature_creator_openssl.cc',
|
| + 'signature_verifier_openssl.cc',
|
| + 'symmetric_key_openssl.cc',
|
| ],
|
| },],
|
| ],
|
| 'sources': [
|
| - 'crypto/capi_util.cc',
|
| - 'crypto/capi_util.h',
|
| - 'crypto/crypto_module_blocking_password_delegate.h',
|
| - 'crypto/cssm_init.cc',
|
| - 'crypto/cssm_init.h',
|
| - 'crypto/encryptor.h',
|
| - 'crypto/encryptor_mac.cc',
|
| - 'crypto/encryptor_nss.cc',
|
| - 'crypto/encryptor_openssl.cc',
|
| - 'crypto/encryptor_win.cc',
|
| - 'crypto/mac_security_services_lock.cc',
|
| - 'crypto/mac_security_services_lock.h',
|
| - 'crypto/rsa_private_key.h',
|
| - 'crypto/rsa_private_key.cc',
|
| - 'crypto/rsa_private_key_mac.cc',
|
| - 'crypto/rsa_private_key_nss.cc',
|
| - 'crypto/rsa_private_key_openssl.cc',
|
| - 'crypto/rsa_private_key_win.cc',
|
| - 'crypto/secure_hash.h',
|
| - 'crypto/secure_hash_default.cc',
|
| - 'crypto/secure_hash_openssl.cc',
|
| - 'crypto/signature_creator.h',
|
| - 'crypto/signature_creator_mac.cc',
|
| - 'crypto/signature_creator_nss.cc',
|
| - 'crypto/signature_creator_openssl.cc',
|
| - 'crypto/signature_creator_win.cc',
|
| - 'crypto/signature_verifier.h',
|
| - 'crypto/signature_verifier_mac.cc',
|
| - 'crypto/signature_verifier_nss.cc',
|
| - 'crypto/signature_verifier_openssl.cc',
|
| - 'crypto/signature_verifier_win.cc',
|
| - 'crypto/symmetric_key.h',
|
| - 'crypto/symmetric_key_mac.cc',
|
| - 'crypto/symmetric_key_nss.cc',
|
| - 'crypto/symmetric_key_openssl.cc',
|
| - 'crypto/symmetric_key_win.cc',
|
| - 'third_party/nspr/prcpucfg.h',
|
| - 'third_party/nspr/prcpucfg_win.h',
|
| - 'third_party/nspr/prtypes.h',
|
| - 'third_party/nss/blapi.h',
|
| - 'third_party/nss/blapit.h',
|
| - 'third_party/nss/sha256.h',
|
| - 'third_party/nss/sha512.cc',
|
| - 'third_party/purify/pure.h',
|
| - 'third_party/purify/pure_api.c',
|
| - 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
|
| - 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
|
| - 'auto_reset.h',
|
| - 'base64.cc',
|
| - 'base64.h',
|
| - 'event_recorder.cc',
|
| - 'event_recorder.h',
|
| - 'event_recorder_stubs.cc',
|
| - 'file_descriptor_shuffle.cc',
|
| - 'file_descriptor_shuffle.h',
|
| + 'capi_util.cc',
|
| + 'capi_util.h',
|
| + 'crypto_module_blocking_password_delegate.h',
|
| + 'cssm_init.cc',
|
| + 'cssm_init.h',
|
| + 'encryptor.h',
|
| + 'encryptor_mac.cc',
|
| + 'encryptor_nss.cc',
|
| + 'encryptor_openssl.cc',
|
| + 'encryptor_win.cc',
|
| 'hmac.h',
|
| 'hmac_mac.cc',
|
| 'hmac_nss.cc',
|
| 'hmac_openssl.cc',
|
| 'hmac_win.cc',
|
| - 'linux_util.cc',
|
| - 'linux_util.h',
|
| - 'md5.cc',
|
| - 'md5.h',
|
| - 'message_pump_glib.cc',
|
| - 'message_pump_glib.h',
|
| - 'message_pump_glib_x.cc',
|
| - 'message_pump_glib_x.h',
|
| - 'message_pump_glib_x_dispatch.h',
|
| - 'message_pump_libevent.cc',
|
| - 'message_pump_libevent.h',
|
| - 'message_pump_mac.h',
|
| - 'message_pump_mac.mm',
|
| - 'metrics/field_trial.cc',
|
| - 'metrics/field_trial.h',
|
| - 'nss_util.cc',
|
| - 'nss_util.h',
|
| + 'mac_security_services_lock.cc',
|
| + 'mac_security_services_lock.h',
|
| 'openssl_util.cc',
|
| 'openssl_util.h',
|
| + 'nss_util.cc',
|
| + 'nss_util.h',
|
| + 'nss_util_internal.h',
|
| + 'rsa_private_key.h',
|
| + 'rsa_private_key.cc',
|
| + 'rsa_private_key_mac.cc',
|
| + 'rsa_private_key_nss.cc',
|
| + 'rsa_private_key_openssl.cc',
|
| + 'rsa_private_key_win.cc',
|
| + 'scoped_capi_types.h',
|
| + 'scoped_nss_types.h',
|
| + 'secure_hash.h',
|
| + 'secure_hash_default.cc',
|
| + 'secure_hash_openssl.cc',
|
| 'sha2.cc',
|
| 'sha2.h',
|
| 'sha2_openssl.cc',
|
| - 'string16.cc',
|
| - 'string16.h',
|
| - 'sync_socket.h',
|
| - 'sync_socket_win.cc',
|
| - 'sync_socket_posix.cc',
|
| - 'time_mac.cc',
|
| - 'time_posix.cc',
|
| + 'signature_creator.h',
|
| + 'signature_creator_mac.cc',
|
| + 'signature_creator_nss.cc',
|
| + 'signature_creator_openssl.cc',
|
| + 'signature_creator_win.cc',
|
| + 'signature_verifier.h',
|
| + 'signature_verifier_mac.cc',
|
| + 'signature_verifier_nss.cc',
|
| + 'signature_verifier_openssl.cc',
|
| + 'signature_verifier_win.cc',
|
| + 'symmetric_key.h',
|
| + 'symmetric_key_mac.cc',
|
| + 'symmetric_key_nss.cc',
|
| + 'symmetric_key_openssl.cc',
|
| + 'symmetric_key_win.cc',
|
| + 'third_party/nss/blapi.h',
|
| + 'third_party/nss/blapit.h',
|
| + 'third_party/nss/sha256.h',
|
| + 'third_party/nss/sha512.cc',
|
| ],
|
| },
|
| - ],
|
| - 'conditions': [
|
| - [ 'OS == "win"', {
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'base_nacl_win64',
|
| - 'type': '<(library)',
|
| - 'msvs_guid': 'CEE1F794-DC70-4FED-B7C4-4C12986672FE',
|
| - 'variables': {
|
| - 'base_target': 1,
|
| - },
|
| - 'dependencies': [
|
| - 'base_static_win64',
|
| - 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
|
| - ],
|
| - # TODO(gregoryd): direct_dependent_settings should be shared with the
|
| - # 32-bit target, but it doesn't work due to a bug in gyp
|
| - 'direct_dependent_settings': {
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - },
|
| - 'defines': [
|
| - '<@(nacl_win64_defines)',
|
| - ],
|
| - 'sources': [
|
| - 'i18n/icu_util_nacl_win64.cc',
|
| - ],
|
| - 'configurations': {
|
| - 'Common_Base': {
|
| - 'msvs_target_platform': 'x64',
|
| - },
|
| - },
|
| - },
|
| + {
|
| + 'target_name': 'crypto_unittests',
|
| + 'type': 'executable',
|
| + 'sources': [
|
| + # Infrastructure files.
|
| + 'run_all_unittests.cc',
|
| +
|
| + # Tests.
|
| + 'encryptor_unittest.cc',
|
| + 'hmac_unittest.cc',
|
| + 'rsa_private_key_unittest.cc',
|
| + 'rsa_private_key_nss_unittest.cc',
|
| + 'secure_hash_unittest.cc',
|
| + 'sha2_unittest.cc',
|
| + 'signature_creator_unittest.cc',
|
| + 'signature_verifier_unittest.cc',
|
| + 'symmetric_key_unittest.cc',
|
| ],
|
| - }],
|
| - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'symbolize',
|
| - 'type': '<(library)',
|
| - 'variables': {
|
| - 'chromium_code': 0,
|
| - },
|
| + 'dependencies': [
|
| + 'crypto',
|
| + '../base/base.gyp:base',
|
| + '../base/base.gyp:test_support_base',
|
| + '../testing/gmock.gyp:gmock',
|
| + '../testing/gtest.gyp:gtest',
|
| + ],
|
| + 'conditions': [
|
| + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
|
| 'conditions': [
|
| - [ 'OS == "solaris"', {
|
| - 'include_dirs': [
|
| - '/usr/gnu/include',
|
| - '/usr/gnu/include/libelf',
|
| - ],
|
| - },],
|
| + [ 'linux_use_tcmalloc==1', {
|
| + 'dependencies': [
|
| + 'allocator/allocator.gyp:allocator',
|
| + ],
|
| + },
|
| + ],
|
| + 8],
|
| + 'dependencies': [
|
| + '../build/linux/system.gyp:nss',
|
| ],
|
| - 'cflags': [
|
| - '-Wno-sign-compare',
|
| + }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
|
| + 'sources!': [
|
| + 'rsa_private_key_nss_unittest.cc',
|
| + ]
|
| + }],
|
| + [ 'OS == "mac" or OS == "win"', {
|
| + 'dependencies': [
|
| + '../third_party/nss/nss.gyp:nss',
|
| ],
|
| - 'cflags!': [
|
| - '-Wextra',
|
| + }],
|
| + [ 'use_openssl==1', {
|
| + 'sources!': [
|
| + 'rsa_private_key_nss_unittest.cc',
|
| ],
|
| - 'sources': [
|
| - 'third_party/symbolize/symbolize.cc',
|
| - 'third_party/symbolize/demangle.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'xdg_mime',
|
| - 'type': '<(library)',
|
| - 'variables': {
|
| - 'chromium_code': 0,
|
| - },
|
| - 'cflags!': [
|
| - '-Wextra',
|
| - ],
|
| - 'sources': [
|
| - 'third_party/xdg_mime/xdgmime.c',
|
| - 'third_party/xdg_mime/xdgmime.h',
|
| - 'third_party/xdg_mime/xdgmimealias.c',
|
| - 'third_party/xdg_mime/xdgmimealias.h',
|
| - 'third_party/xdg_mime/xdgmimecache.c',
|
| - 'third_party/xdg_mime/xdgmimecache.h',
|
| - 'third_party/xdg_mime/xdgmimeglob.c',
|
| - 'third_party/xdg_mime/xdgmimeglob.h',
|
| - 'third_party/xdg_mime/xdgmimeicon.c',
|
| - 'third_party/xdg_mime/xdgmimeicon.h',
|
| - 'third_party/xdg_mime/xdgmimeint.c',
|
| - 'third_party/xdg_mime/xdgmimeint.h',
|
| - 'third_party/xdg_mime/xdgmimemagic.c',
|
| - 'third_party/xdg_mime/xdgmimemagic.h',
|
| - 'third_party/xdg_mime/xdgmimeparent.c',
|
| - 'third_party/xdg_mime/xdgmimeparent.h',
|
| - ],
|
| - },
|
| + }],
|
| ],
|
| - }],
|
| + },
|
| ],
|
| }
|
|
|
Chromium Code Reviews
Issue 6805019:
Move crypto files out of base, to a top level directory. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/