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 'target_defaults': { | 6 'target_defaults': { |
7 'variables': { | 7 'variables': { |
8 'installer_util_target': 0, | 8 'installer_util_target': 0, |
9 }, | 9 }, |
10 'target_conditions': [ | 10 'target_conditions': [ |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
114 'variables': { | 114 'variables': { |
115 'installer_util_target': 1, | 115 'installer_util_target': 1, |
116 }, | 116 }, |
117 'dependencies': [ | 117 'dependencies': [ |
118 'installer_util_strings', | 118 'installer_util_strings', |
119 '<(DEPTH)/base/base.gyp:base', | 119 '<(DEPTH)/base/base.gyp:base', |
120 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', | 120 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', |
121 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', | 121 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', |
122 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', | 122 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', |
123 '<(DEPTH)/chrome/common_constants.gyp:common_constants', | 123 '<(DEPTH)/chrome/common_constants.gyp:common_constants', |
124 '<(DEPTH)/components/components.gyp:metrics', | |
124 '<(DEPTH)/courgette/courgette.gyp:courgette_lib', | 125 '<(DEPTH)/courgette/courgette.gyp:courgette_lib', |
125 '<(DEPTH)/crypto/crypto.gyp:crypto', | 126 '<(DEPTH)/crypto/crypto.gyp:crypto', |
126 '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', | 127 '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', |
127 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', | 128 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', |
128 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', | 129 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', |
129 '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', | 130 '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', |
130 ], | 131 ], |
131 'sources': [ | 132 'sources': [ |
132 'installer/util/chrome_app_host_operations.cc', | 133 'installer/util/chrome_app_host_operations.cc', |
133 'installer/util/chrome_app_host_operations.h', | 134 'installer/util/chrome_app_host_operations.h', |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
177 ['OS=="win" and target_arch=="ia32"', { | 178 ['OS=="win" and target_arch=="ia32"', { |
178 'targets': [ | 179 'targets': [ |
179 { | 180 { |
180 'target_name': 'installer_util_nacl_win64', | 181 'target_name': 'installer_util_nacl_win64', |
181 'type': 'static_library', | 182 'type': 'static_library', |
182 'variables': { | 183 'variables': { |
183 'installer_util_target': 1, | 184 'installer_util_target': 1, |
184 }, | 185 }, |
185 'dependencies': [ | 186 'dependencies': [ |
186 'installer_util_strings', | 187 'installer_util_strings', |
188 '<(DEPTH)/components/components.gyp:metrics', | |
gab
2014/07/16 20:36:54
This dependency causes link errors between x86 vs
Ilya Sherman
2014/07/16 20:40:42
Justin, could you help us understand this error me
jschuh
2014/07/16 23:40:19
I'm stumped. The error message means that you're g
grt (UTC plus 2)
2014/07/18 01:14:49
is this dependency even needed? installer_util_nac
gab
2014/07/18 02:41:06
It does, google_update_settings.cc is in target_de
| |
187 ], | 189 ], |
188 'include_dirs': [ | 190 'include_dirs': [ |
189 '<(SHARED_INTERMEDIATE_DIR)', | 191 '<(SHARED_INTERMEDIATE_DIR)', |
190 ], | 192 ], |
191 'sources': [ | 193 'sources': [ |
192 'installer/util/google_chrome_distribution_dummy.cc', | 194 'installer/util/google_chrome_distribution_dummy.cc', |
193 'installer/util/master_preferences.h', | 195 'installer/util/master_preferences.h', |
194 'installer/util/master_preferences_dummy.cc', | 196 'installer/util/master_preferences_dummy.cc', |
195 ], | 197 ], |
196 'configurations': { | 198 'configurations': { |
(...skipping 24 matching lines...) Expand all Loading... | |
221 ], | 223 ], |
222 'include_dirs': [ | 224 'include_dirs': [ |
223 '<(DEPTH)', | 225 '<(DEPTH)', |
224 ], | 226 ], |
225 } | 227 } |
226 ], | 228 ], |
227 }], | 229 }], |
228 | 230 |
229 ], | 231 ], |
230 } | 232 } |
OLD | NEW |