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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 11637016: Add "scrypt" to third_party for secure password hashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add scrypt to .gitignore Created 8 years 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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2433 ['exclude', '^browser/safe_browsing/'], 2433 ['exclude', '^browser/safe_browsing/'],
2434 ['include', '^browser/safe_browsing/safe_browsing_tab_observer.cc'], 2434 ['include', '^browser/safe_browsing/safe_browsing_tab_observer.cc'],
2435 ['include', '^browser/safe_browsing/safe_browsing_tab_observer.h'], 2435 ['include', '^browser/safe_browsing/safe_browsing_tab_observer.h'],
2436 ], 2436 ],
2437 }], 2437 }],
2438 ['OS=="linux"', { 2438 ['OS=="linux"', {
2439 'dependencies': [ 2439 'dependencies': [
2440 'mtp_file_entry_proto', 2440 'mtp_file_entry_proto',
2441 'mtp_storage_info_proto', 2441 'mtp_storage_info_proto',
2442 '../build/linux/system.gyp:udev', 2442 '../build/linux/system.gyp:udev',
2443 '../third_party/scrypt/scrypt.gyp:libscrypt',
2443 ], 2444 ],
2444 'sources': [ 2445 'sources': [
2445 'browser/media_transfer_protocol/media_transfer_protocol_daemon_clie nt.cc', 2446 'browser/media_transfer_protocol/media_transfer_protocol_daemon_clie nt.cc',
2446 'browser/media_transfer_protocol/media_transfer_protocol_daemon_clie nt.h', 2447 'browser/media_transfer_protocol/media_transfer_protocol_daemon_clie nt.h',
2447 'browser/media_transfer_protocol/media_transfer_protocol_manager.cc' , 2448 'browser/media_transfer_protocol/media_transfer_protocol_manager.cc' ,
2448 'browser/media_transfer_protocol/media_transfer_protocol_manager.h', 2449 'browser/media_transfer_protocol/media_transfer_protocol_manager.h',
2449 ], 2450 ],
2450 }], 2451 }],
2451 ['OS=="linux" and chromeos==0', { 2452 ['OS=="linux" and chromeos==0', {
2452 'dependencies': [ 2453 'dependencies': [
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
2818 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 2819 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
2819 '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework', 2820 '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework',
2820 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', 2821 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
2821 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 2822 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
2822 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 2823 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
2823 '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework' , 2824 '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework' ,
2824 ], 2825 ],
2825 }, 2826 },
2826 'dependencies': [ 2827 'dependencies': [
2827 '../third_party/icon_family/icon_family.gyp:icon_family', 2828 '../third_party/icon_family/icon_family.gyp:icon_family',
2829 '../third_party/scrypt/scrypt.gyp:libscrypt',
2828 ], 2830 ],
2829 'sources': [ 2831 'sources': [
2830 # Build the necessary GTM sources 2832 # Build the necessary GTM sources
2831 '../third_party/GTM/Foundation/GTMServiceManagement.h', 2833 '../third_party/GTM/Foundation/GTMServiceManagement.h',
2832 '../third_party/GTM/Foundation/GTMServiceManagement.c', 2834 '../third_party/GTM/Foundation/GTMServiceManagement.c',
2833 ], 2835 ],
2834 'include_dirs': [ 2836 'include_dirs': [
2835 '../third_party/GTM', 2837 '../third_party/GTM',
2836 '../third_party/GTM/Foundation', 2838 '../third_party/GTM/Foundation',
2837 ], 2839 ],
(...skipping 10 matching lines...) Expand all
2848 }], 2850 }],
2849 ['OS=="win"', { 2851 ['OS=="win"', {
2850 'include_dirs': [ 2852 'include_dirs': [
2851 '<(DEPTH)/third_party/wtl/include', 2853 '<(DEPTH)/third_party/wtl/include',
2852 ], 2854 ],
2853 'dependencies': [ 2855 'dependencies': [
2854 'installer_util_strings', 2856 'installer_util_strings',
2855 '../google_update/google_update.gyp:google_update', 2857 '../google_update/google_update.gyp:google_update',
2856 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2858 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2857 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2859 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2860 '../third_party/scrypt/scrypt.gyp:libscrypt',
2858 '../ui/views/controls/webview/webview.gyp:webview', 2861 '../ui/views/controls/webview/webview.gyp:webview',
2859 '../ui/views/views.gyp:views', 2862 '../ui/views/views.gyp:views',
2860 '../win8/win8.gyp:win8_util', 2863 '../win8/win8.gyp:win8_util',
2861 ], 2864 ],
2862 'export_dependent_settings': [ 2865 'export_dependent_settings': [
2863 '../ui/views/controls/webview/webview.gyp:webview', 2866 '../ui/views/controls/webview/webview.gyp:webview',
2864 '../ui/views/views.gyp:views', 2867 '../ui/views/views.gyp:views',
2865 ], 2868 ],
2866 'sources': [ 2869 'sources': [
2867 # Using built-in rule in vstudio for midl. 2870 # Using built-in rule in vstudio for midl.
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
3121 'proto_in_dir': '../third_party/cros_system_api/dbus', 3124 'proto_in_dir': '../third_party/cros_system_api/dbus',
3122 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 3125 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
3123 }, 3126 },
3124 'includes': ['../build/protoc.gypi'], 3127 'includes': ['../build/protoc.gypi'],
3125 }, 3128 },
3126 ], 3129 ],
3127 }, 3130 },
3128 ], 3131 ],
3129 ], 3132 ],
3130 } 3133 }
OLDNEW
« no previous file with comments | « .gitignore ('k') | third_party/scrypt/.gitattributes » ('j') | third_party/scrypt/scrypt.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698