| 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 { | 5 { | 
| 6   'targets': [ | 6   'targets': [ | 
| 7     { | 7     { | 
| 8       'target_name': 'browser_extensions', | 8       'target_name': 'browser_extensions', | 
| 9       'type': 'static_library', | 9       'type': 'static_library', | 
| 10       'variables': { 'enable_wexit_time_destructors': 1, }, | 10       'variables': { 'enable_wexit_time_destructors': 1, }, | 
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 492             '../build/linux/system.gyp:gtk', | 492             '../build/linux/system.gyp:gtk', | 
| 493             '../build/linux/system.gyp:gtkprint', | 493             '../build/linux/system.gyp:gtkprint', | 
| 494             '../build/linux/system.gyp:ssl', | 494             '../build/linux/system.gyp:ssl', | 
| 495             '../build/linux/system.gyp:x11', | 495             '../build/linux/system.gyp:x11', | 
| 496             '../dbus/dbus.gyp:dbus', | 496             '../dbus/dbus.gyp:dbus', | 
| 497             '../third_party/undoview/undoview.gyp:undoview', | 497             '../third_party/undoview/undoview.gyp:undoview', | 
| 498           ], | 498           ], | 
| 499         }], | 499         }], | 
| 500         ['OS=="win"', { | 500         ['OS=="win"', { | 
| 501           'dependencies': [ | 501           'dependencies': [ | 
| 502             '../rlz/rlz.gyp:rlz_lib', |  | 
| 503             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 502             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', | 
| 504             '../third_party/isimpledom/isimpledom.gyp:isimpledom', | 503             '../third_party/isimpledom/isimpledom.gyp:isimpledom', | 
| 505           ], | 504           ], | 
| 506           'conditions': [ | 505           'conditions': [ | 
| 507             ['win_use_allocator_shim==1', { | 506             ['win_use_allocator_shim==1', { | 
| 508               'dependencies': [ | 507               'dependencies': [ | 
| 509                 '<(allocator_target)', | 508                 '<(allocator_target)', | 
| 510               ], | 509               ], | 
| 511             }], | 510             }], | 
| 512           ], | 511           ], | 
| 513         }, {  # 'OS!="win" | 512         }, {  # 'OS!="win" | 
| 514           'conditions': [ | 513           'conditions': [ | 
| 515             ['OS=="linux" and toolkit_views==1',{ | 514             ['OS=="linux" and toolkit_views==1',{ | 
| 516               'include_dirs': [ | 515               'include_dirs': [ | 
| 517                 '<(INTERMEDIATE_DIR)', | 516                 '<(INTERMEDIATE_DIR)', | 
| 518                 '<(INTERMEDIATE_DIR)/chrome', | 517                 '<(INTERMEDIATE_DIR)/chrome', | 
| 519               ], | 518               ], | 
| 520               'sources/': [ | 519               'sources/': [ | 
| 521                 ['include', '^browser/extensions/'], | 520                 ['include', '^browser/extensions/'], | 
| 522                 # This exclude duplicates the one just above because of the |  | 
| 523                 # order of evaluation of the 'sources/' rule above, the |  | 
| 524                 # conditions, and this 'sources/' rule. |  | 
| 525                 ['exclude', '^browser/extensions/extension_rlz_module'], |  | 
| 526 | 521 | 
| 527                 # Other excluded stuff. | 522                 # Other excluded stuff. | 
| 528                 ['exclude', '^browser/extensions/browser_action_test_util_gtk.cc
     '], | 523                 ['exclude', '^browser/extensions/browser_action_test_util_gtk.cc
     '], | 
| 529                 ['exclude', '^browser/extensions/extension_host_mac.h'], | 524                 ['exclude', '^browser/extensions/extension_host_mac.h'], | 
| 530                 ['exclude', '^browser/extensions/extension_host_mac.mm'], | 525                 ['exclude', '^browser/extensions/extension_host_mac.mm'], | 
| 531                 ['exclude', '^browser/extensions/external_registry_extension_loa
     der_win.cc'], | 526                 ['exclude', '^browser/extensions/external_registry_extension_loa
     der_win.cc'], | 
| 532                 ['exclude', '^browser/extensions/external_registry_extension_loa
     der_win.h'], | 527                 ['exclude', '^browser/extensions/external_registry_extension_loa
     der_win.h'], | 
| 533               ], | 528               ], | 
| 534             }], | 529             }], | 
| 535             # Exclude these toolkit_views specific files again. | 530             # Exclude these toolkit_views specific files again. | 
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 570                 }], | 565                 }], | 
| 571               ], | 566               ], | 
| 572             }], | 567             }], | 
| 573           ], | 568           ], | 
| 574         }], | 569         }], | 
| 575       ], | 570       ], | 
| 576     }, | 571     }, | 
| 577   ], | 572   ], | 
| 578 } | 573 } | 
| 579 | 574 | 
| OLD | NEW | 
|---|