| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 | 9 |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 ], | 78 ], |
| 79 'target_conditions': [ | 79 'target_conditions': [ |
| 80 ['OS=="ios"', { | 80 ['OS=="ios"', { |
| 81 # iOS needs chrome_paths_mac, which is excluded by filename rules; | 81 # iOS needs chrome_paths_mac, which is excluded by filename rules; |
| 82 # re-add it in target_conditionals so it's after that exclusion. | 82 # re-add it in target_conditionals so it's after that exclusion. |
| 83 'sources/': [ | 83 'sources/': [ |
| 84 ['include', '^common/chrome_paths_mac\\.mm$'], | 84 ['include', '^common/chrome_paths_mac\\.mm$'], |
| 85 ], | 85 ], |
| 86 }], | 86 }], |
| 87 ], | 87 ], |
| 88 'conditions': [ | |
| 89 ['toolkit_uses_gtk == 1', { | |
| 90 'dependencies': ['../build/linux/system.gyp:gtk'], | |
| 91 }], | |
| 92 ], | |
| 93 }, | 88 }, |
| 94 ], | 89 ], |
| 95 'conditions': [ | 90 'conditions': [ |
| 96 ['OS=="win" and target_arch=="ia32"', { | 91 ['OS=="win" and target_arch=="ia32"', { |
| 97 'targets': [ | 92 'targets': [ |
| 98 { | 93 { |
| 99 'target_name': 'common_constants_win64', | 94 'target_name': 'common_constants_win64', |
| 100 'type': 'static_library', | 95 'type': 'static_library', |
| 101 'include_dirs': [ | 96 'include_dirs': [ |
| 102 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. | 97 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. |
| (...skipping 11 matching lines...) Expand all Loading... |
| 114 'configurations': { | 109 'configurations': { |
| 115 'Common_Base': { | 110 'Common_Base': { |
| 116 'msvs_target_platform': 'x64', | 111 'msvs_target_platform': 'x64', |
| 117 }, | 112 }, |
| 118 }, | 113 }, |
| 119 }, | 114 }, |
| 120 ], | 115 ], |
| 121 }], | 116 }], |
| 122 ], | 117 ], |
| 123 } | 118 } |
| OLD | NEW |