| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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': 'chrome', | 8 'target_name': 'chrome', |
| 9 'type': 'executable', | 9 'type': 'executable', |
| 10 'mac_bundle': 1, | 10 'mac_bundle': 1, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 }, | 43 }, |
| 44 'conditions': [ | 44 'conditions': [ |
| 45 ['order_text_section!=""', { | 45 ['order_text_section!=""', { |
| 46 'target_conditions' : [ | 46 'target_conditions' : [ |
| 47 ['_toolset=="target"', { | 47 ['_toolset=="target"', { |
| 48 'ldflags': [ | 48 'ldflags': [ |
| 49 '-Wl,-section-ordering-file=<(order_text_section)' ], | 49 '-Wl,-section-ordering-file=<(order_text_section)' ], |
| 50 }], | 50 }], |
| 51 ] | 51 ] |
| 52 }], | 52 }], |
| 53 ['use_aura==1 and use_webkit_compositor==0', { | |
| 54 'dependencies': [ | |
| 55 '../ui/gfx/compositor/compositor.gyp:test_compositor', | |
| 56 ], | |
| 57 }], | |
| 58 ['OS == "android"', { | 53 ['OS == "android"', { |
| 59 # Don't put the 'chrome' target in 'all' on android | 54 # Don't put the 'chrome' target in 'all' on android |
| 60 'suppress_wildcard': 1, | 55 'suppress_wildcard': 1, |
| 61 }], | 56 }], |
| 62 ['os_posix == 1 and OS != "mac"', { | 57 ['os_posix == 1 and OS != "mac"', { |
| 63 'actions': [ | 58 'actions': [ |
| 64 { | 59 { |
| 65 'action_name': 'manpage', | 60 'action_name': 'manpage', |
| 66 'conditions': [ | 61 'conditions': [ |
| 67 [ 'branding == "Chrome"', { | 62 [ 'branding == "Chrome"', { |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 'configurations': { | 557 'configurations': { |
| 563 'Common_Base': { | 558 'Common_Base': { |
| 564 'msvs_target_platform': 'x64', | 559 'msvs_target_platform': 'x64', |
| 565 }, | 560 }, |
| 566 }, | 561 }, |
| 567 }, | 562 }, |
| 568 ], | 563 ], |
| 569 }], | 564 }], |
| 570 ], | 565 ], |
| 571 } | 566 } |
| OLD | NEW |