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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move some code to chrome/browser/ssl/ Created 8 years, 1 month 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 1797 matching lines...) Expand 10 before | Expand all | Expand 10 after
1808 'browser/spellchecker/spellcheck_message_filter.h', 1808 'browser/spellchecker/spellcheck_message_filter.h',
1809 'browser/spellchecker/spellcheck_message_filter_mac.cc', 1809 'browser/spellchecker/spellcheck_message_filter_mac.cc',
1810 'browser/spellchecker/spellcheck_message_filter_mac.h', 1810 'browser/spellchecker/spellcheck_message_filter_mac.h',
1811 'browser/spellchecker/spellcheck_platform_mac.h', 1811 'browser/spellchecker/spellcheck_platform_mac.h',
1812 'browser/spellchecker/spellcheck_platform_mac.mm', 1812 'browser/spellchecker/spellcheck_platform_mac.mm',
1813 'browser/spellchecker/spellcheck_profile_provider.h', 1813 'browser/spellchecker/spellcheck_profile_provider.h',
1814 'browser/spellchecker/spellcheck_service.cc', 1814 'browser/spellchecker/spellcheck_service.cc',
1815 'browser/spellchecker/spellcheck_service.h', 1815 'browser/spellchecker/spellcheck_service.h',
1816 'browser/spellchecker/spelling_service_client.cc', 1816 'browser/spellchecker/spelling_service_client.cc',
1817 'browser/spellchecker/spelling_service_client.h', 1817 'browser/spellchecker/spelling_service_client.h',
1818 'browser/ssl/ssl_add_certificate.cc',
1819 'browser/ssl/ssl_add_certificate.h',
1818 'browser/ssl/ssl_add_cert_handler.cc', 1820 'browser/ssl/ssl_add_cert_handler.cc',
1819 'browser/ssl/ssl_add_cert_handler.h', 1821 'browser/ssl/ssl_add_cert_handler.h',
1820 'browser/ssl/ssl_add_cert_handler_mac.mm', 1822 'browser/ssl/ssl_add_cert_handler_mac.mm',
1821 'browser/ssl/ssl_blocking_page.cc', 1823 'browser/ssl/ssl_blocking_page.cc',
1822 'browser/ssl/ssl_blocking_page.h', 1824 'browser/ssl/ssl_blocking_page.h',
1823 'browser/ssl/ssl_client_auth_observer.cc', 1825 'browser/ssl/ssl_client_auth_observer.cc',
1824 'browser/ssl/ssl_client_auth_observer.h', 1826 'browser/ssl/ssl_client_auth_observer.h',
1825 'browser/ssl/ssl_client_certificate_selector.h', 1827 'browser/ssl/ssl_client_certificate_selector.h',
1826 'browser/ssl/ssl_error_info.cc', 1828 'browser/ssl/ssl_error_info.cc',
1827 'browser/ssl/ssl_error_info.h', 1829 'browser/ssl/ssl_error_info.h',
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
2631 ], 2633 ],
2632 }], 2634 }],
2633 ['OS=="android"', { 2635 ['OS=="android"', {
2634 'dependencies': [ 2636 'dependencies': [
2635 '../content/content.gyp:web_contents_delegate_android', 2637 '../content/content.gyp:web_contents_delegate_android',
2636 'chrome_browser_jni_headers', 2638 'chrome_browser_jni_headers',
2637 ], 2639 ],
2638 'sources': [ 2640 'sources': [
2639 'browser/sessions/in_memory_tab_restore_service.cc', 2641 'browser/sessions/in_memory_tab_restore_service.cc',
2640 'browser/sessions/in_memory_tab_restore_service.h', 2642 'browser/sessions/in_memory_tab_restore_service.h',
2643 'browser/ssl/ssl_add_certificate_android.cc',
2641 'browser/web_resource/notification_promo_mobile_ntp.cc', 2644 'browser/web_resource/notification_promo_mobile_ntp.cc',
2642 'browser/web_resource/notification_promo_mobile_ntp.h', 2645 'browser/web_resource/notification_promo_mobile_ntp.h',
2643 ], 2646 ],
2644 'sources!': [ 2647 'sources!': [
2645 'browser/bookmarks/bookmark_drop_info.cc', 2648 'browser/bookmarks/bookmark_drop_info.cc',
2646 # Bookmark export/import are handled via the BookmarkColumns 2649 # Bookmark export/import are handled via the BookmarkColumns
2647 # ContentProvider. 2650 # ContentProvider.
2648 'browser/bookmarks/bookmark_html_writer.cc', 2651 'browser/bookmarks/bookmark_html_writer.cc',
2652 'browser/ssl/ssl_add_certificate.cc',
2649 2653
2650 # about:flags is unsupported. 2654 # about:flags is unsupported.
2651 'browser/about_flags.cc', 2655 'browser/about_flags.cc',
2652 'browser/about_flags.h', 2656 'browser/about_flags.h',
2653 2657
2654 'browser/jankometer.cc', 2658 'browser/jankometer.cc',
2655 'browser/sync/sync_global_error.cc', 2659 'browser/sync/sync_global_error.cc',
2656 'browser/sync/sync_global_error.h', 2660 'browser/sync/sync_global_error.h',
2657 2661
2658 # There's no Browser/BrowserList on Android. 2662 # There's no Browser/BrowserList on Android.
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
3050 'proto_in_dir': '../third_party/cros_system_api/dbus', 3054 'proto_in_dir': '../third_party/cros_system_api/dbus',
3051 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 3055 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
3052 }, 3056 },
3053 'includes': ['../build/protoc.gypi'], 3057 'includes': ['../build/protoc.gypi'],
3054 }, 3058 },
3055 ], 3059 ],
3056 }, 3060 },
3057 ], 3061 ],
3058 ], 3062 ],
3059 } 3063 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698