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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 18770006: Remove USE_LINUX_BREAKPAD ifdef since we don't need it for chromium anymore. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: android build fix per cjhopman Created 7 years, 5 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 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 2758 matching lines...) Expand 10 before | Expand all | Expand 10 after
2769 ], 2769 ],
2770 }], 2770 }],
2771 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 2771 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
2772 'link_settings': { 2772 'link_settings': {
2773 'libraries': [ 2773 'libraries': [
2774 '-lXss', 2774 '-lXss',
2775 ], 2775 ],
2776 }, 2776 },
2777 }], 2777 }],
2778 ['os_posix == 1 and OS != "mac" and OS != "ios"', { 2778 ['os_posix == 1 and OS != "mac" and OS != "ios"', {
2779 'sources': [ 'browser/crash_handler_host_linux.h', ], 2779 'sources': [
2780 'conditions': [ 2780 'app/breakpad_linux.cc',
2781 ['linux_breakpad==1', { 2781 'app/breakpad_linux.h',
2782 'sources': [ 2782 'app/chrome_breakpad_client.cc',
2783 'app/breakpad_linux.cc', 2783 'app/chrome_breakpad_client.h',
2784 'app/breakpad_linux.h', 2784 'browser/crash_handler_host_linux.cc',
2785 'app/chrome_breakpad_client.cc', 2785 'browser/crash_handler_host_linux.h',
2786 'app/chrome_breakpad_client.h', 2786 ],
2787 'browser/crash_handler_host_linux.cc', 2787 'dependencies': [
2788 ], 2788 '../breakpad/breakpad.gyp:breakpad_client',
2789 'dependencies': [ 2789 '../components/components.gyp:breakpad_component',
2790 '../breakpad/breakpad.gyp:breakpad_client', 2790 # make sure file_version_info_linux.h is generated first.
2791 '../components/components.gyp:breakpad_component', 2791 'common',
2792 # make sure file_version_info_linux.h is generated first. 2792 ],
2793 'common', 2793 'include_dirs': [
2794 ], 2794 # breakpad_linux.cc uses generated file_version_info_linux.h.
2795 'include_dirs': [ 2795 '<(SHARED_INTERMEDIATE_DIR)',
2796 # breakpad_linux.cc uses generated file_version_info_linux.h. 2796 '../breakpad/src',
2797 '<(SHARED_INTERMEDIATE_DIR)',
2798 '../breakpad/src',
2799 ],
2800 }, { # linux_breakpad==0
2801 'sources': [
2802 'browser/crash_handler_host_linux_stub.cc',
2803 ],
2804 }],
2805 ], 2797 ],
2806 }], 2798 }],
2807 ['use_nss==1', { 2799 ['use_nss==1', {
2808 'sources': [ 2800 'sources': [
2809 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 2801 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
2810 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 2802 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
2811 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', 2803 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
2812 'third_party/mozilla_security_manager/nsNSSCertificate.h', 2804 'third_party/mozilla_security_manager/nsNSSCertificate.h',
2813 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp', 2805 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
2814 'third_party/mozilla_security_manager/nsUsageArrayHelper.h', 2806 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
3186 ] 3178 ]
3187 }], 3179 }],
3188 ], 3180 ],
3189 'target_conditions': [ 3181 'target_conditions': [
3190 # Need 'target_conditions' to override default filename_rules to include 3182 # Need 'target_conditions' to override default filename_rules to include
3191 # the files on Android. 3183 # the files on Android.
3192 ['OS=="android"', { 3184 ['OS=="android"', {
3193 'sources/': [ 3185 'sources/': [
3194 ['include', '^app/breakpad_linux\\.cc$'], 3186 ['include', '^app/breakpad_linux\\.cc$'],
3195 ['include', '^browser/crash_handler_host_linux\\.cc$'], 3187 ['include', '^browser/crash_handler_host_linux\\.cc$'],
3196 ['include', '^browser/crash_handler_host_linux_stub\\.cc$'],
3197 ], 3188 ],
3198 }], 3189 }],
3199 ], 3190 ],
3200 }, 3191 },
3201 { 3192 {
3202 # Protobuf compiler / generator for the fraudulent certificate reporting 3193 # Protobuf compiler / generator for the fraudulent certificate reporting
3203 # protocol buffer. 3194 # protocol buffer.
3204 'target_name': 'cert_logger_proto', 3195 'target_name': 'cert_logger_proto',
3205 'type': 'static_library', 3196 'type': 'static_library',
3206 'sources': [ 'browser/net/cert_logger.proto', ], 3197 'sources': [ 'browser/net/cert_logger.proto', ],
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
3382 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3373 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3383 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3374 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3384 }, 3375 },
3385 'includes': [ '../build/android/java_cpp_template.gypi' ], 3376 'includes': [ '../build/android/java_cpp_template.gypi' ],
3386 }, 3377 },
3387 ], 3378 ],
3388 }, 3379 },
3389 ], 3380 ],
3390 ], 3381 ],
3391 } 3382 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698