| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="mac" or OS=="win"', { | 6 ['OS=="mac" or OS=="win"', { |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'chrome_dll', | 9 'target_name': 'chrome_dll', |
| 10 'type': 'none', | 10 'type': 'none', |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', | 271 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', |
| 272 ], | 272 ], |
| 273 }], | 273 }], |
| 274 ['OS=="mac" and component!="shared_library"', { | 274 ['OS=="mac" and component!="shared_library"', { |
| 275 'includes': [ 'chrome_dll_bundle.gypi' ], | 275 'includes': [ 'chrome_dll_bundle.gypi' ], |
| 276 }], | 276 }], |
| 277 ['OS=="mac" and component=="shared_library"', { | 277 ['OS=="mac" and component=="shared_library"', { |
| 278 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, | 278 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, |
| 279 }], | 279 }], |
| 280 ['OS=="mac"', { | 280 ['OS=="mac"', { |
| 281 'dependencies': [ |
| 282 '../components/components.gyp:crash_component', |
| 283 '../components/components.gyp:policy', |
| 284 ], |
| 285 'sources': [ |
| 286 'app/chrome_crash_reporter_client.cc', |
| 287 'app/chrome_crash_reporter_client.h', |
| 288 'app/chrome_crash_reporter_client_mac.mm', |
| 289 ], |
| 281 'xcode_settings': { | 290 'xcode_settings': { |
| 282 # Define the order of symbols within the framework. This | 291 # Define the order of symbols within the framework. This |
| 283 # sets -order_file. | 292 # sets -order_file. |
| 284 'ORDER_FILE': 'app/framework.order', | 293 'ORDER_FILE': 'app/framework.order', |
| 285 }, | 294 }, |
| 286 'include_dirs': [ | 295 'include_dirs': [ |
| 287 '<(grit_out_dir)', | 296 '<(grit_out_dir)', |
| 288 ], | 297 ], |
| 289 'postbuilds': [ | 298 'postbuilds': [ |
| 290 { | 299 { |
| 291 # This step causes an error to be raised if the .order file | 300 # This step causes an error to be raised if the .order file |
| 292 # does not account for all global text symbols. It | 301 # does not account for all global text symbols. It |
| 293 # validates the completeness of the .order file. | 302 # validates the completeness of the .order file. |
| 294 'postbuild_name': 'Verify global text symbol order', | 303 'postbuild_name': 'Verify global text symbol order', |
| 295 'variables': { | 304 'variables': { |
| 296 'verify_order_path': 'tools/build/mac/verify_order', | 305 'verify_order_path': 'tools/build/mac/verify_order', |
| 297 }, | 306 }, |
| 298 'action': [ | 307 'action': [ |
| 299 '<(verify_order_path)', | 308 '<(verify_order_path)', |
| 300 '_ChromeMain', | 309 '_ChromeMain', |
| 301 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', | 310 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', |
| 302 ], | 311 ], |
| 303 }, | 312 }, |
| 304 ], | 313 ], |
| 305 'conditions': [ | |
| 306 ['mac_breakpad_compiled_in==1', { | |
| 307 'dependencies': [ | |
| 308 '../breakpad/breakpad.gyp:breakpad', | |
| 309 '../components/components.gyp:crash_component', | |
| 310 '../components/components.gyp:policy', | |
| 311 ], | |
| 312 'sources': [ | |
| 313 'app/chrome_crash_reporter_client.cc', | |
| 314 'app/chrome_crash_reporter_client.h', | |
| 315 'app/chrome_crash_reporter_client_mac.mm', | |
| 316 ], | |
| 317 }, { # else: mac_breakpad_compiled_in!=1 | |
| 318 # No Breakpad, put in the stubs. | |
| 319 'dependencies': [ | |
| 320 '../components/components.gyp:breakpad_stubs', | |
| 321 ], | |
| 322 }], # mac_breakpad_compiled_in | |
| 323 ], # conditions | |
| 324 }], # OS=="mac" | 314 }], # OS=="mac" |
| 325 ], # conditions | 315 ], # conditions |
| 326 }, # target chrome_main_dll | 316 }, # target chrome_main_dll |
| 327 ], # targets | 317 ], # targets |
| 328 }], # OS=="mac" or OS=="win" | 318 }], # OS=="mac" or OS=="win" |
| 329 ['chrome_multiple_dll', { | 319 ['chrome_multiple_dll', { |
| 330 'targets': [ | 320 'targets': [ |
| 331 { | 321 { |
| 332 'target_name': 'chrome_child_dll', | 322 'target_name': 'chrome_child_dll', |
| 333 'type': 'shared_library', | 323 'type': 'shared_library', |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 'dependencies': [ | 368 'dependencies': [ |
| 379 '../pdf/pdf.gyp:pdf', | 369 '../pdf/pdf.gyp:pdf', |
| 380 ], | 370 ], |
| 381 }], | 371 }], |
| 382 ], | 372 ], |
| 383 }, # target chrome_child_dll | 373 }, # target chrome_child_dll |
| 384 ], | 374 ], |
| 385 }], | 375 }], |
| 386 ], | 376 ], |
| 387 } | 377 } |
| OLD | NEW |