| 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 'lastchange_path': '../build/util/LASTCHANGE', | 7 'lastchange_path': '../build/util/LASTCHANGE', |
| 8 'libpeer_target_type%': 'static_library', | 8 'libpeer_target_type%': 'static_library', |
| 9 # 'branding_dir' is set in the 'conditions' section at the bottom. | 9 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 10 }, | 10 }, |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 { | 247 { |
| 248 'target_name': 'setup', | 248 'target_name': 'setup', |
| 249 'type': 'executable', | 249 'type': 'executable', |
| 250 'dependencies': [ | 250 'dependencies': [ |
| 251 'installer_util', | 251 'installer_util', |
| 252 'installer_util_strings', | 252 'installer_util_strings', |
| 253 'launcher_support', | 253 'launcher_support', |
| 254 '../base/base.gyp:base', | 254 '../base/base.gyp:base', |
| 255 '../breakpad/breakpad.gyp:breakpad_handler', | 255 '../breakpad/breakpad.gyp:breakpad_handler', |
| 256 '../chrome/common_constants.gyp:common_constants', | 256 '../chrome/common_constants.gyp:common_constants', |
| 257 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', | |
| 258 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 259 '../rlz/rlz.gyp:rlz_lib', | 257 '../rlz/rlz.gyp:rlz_lib', |
| 260 '../third_party/zlib/zlib.gyp:zlib', | 258 '../third_party/zlib/zlib.gyp:zlib', |
| 261 ], | 259 ], |
| 262 'include_dirs': [ | 260 'include_dirs': [ |
| 263 '..', | 261 '..', |
| 264 '<(INTERMEDIATE_DIR)', | 262 '<(INTERMEDIATE_DIR)', |
| 265 '<(SHARED_INTERMEDIATE_DIR)/setup', | 263 '<(SHARED_INTERMEDIATE_DIR)/setup', |
| 266 ], | 264 ], |
| 267 'direct_dependent_settings': { | 265 'direct_dependent_settings': { |
| 268 'include_dirs': [ | 266 'include_dirs': [ |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 'variables': { | 372 'variables': { |
| 375 'branding_dir': 'app/theme/google_chrome', | 373 'branding_dir': 'app/theme/google_chrome', |
| 376 'branding_dir_100': 'app/theme/default_100_percent/google_chrom
e', | 374 'branding_dir_100': 'app/theme/default_100_percent/google_chrom
e', |
| 377 }, | 375 }, |
| 378 }, { # else branding!="Chrome" | 376 }, { # else branding!="Chrome" |
| 379 'variables': { | 377 'variables': { |
| 380 'branding_dir': 'app/theme/chromium', | 378 'branding_dir': 'app/theme/chromium', |
| 381 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 379 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 382 }, | 380 }, |
| 383 }], | 381 }], |
| 384 ['target_arch=="x64"', { | |
| 385 'dependencies!': [ | |
| 386 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', | |
| 387 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 388 ], | |
| 389 'defines': [ | |
| 390 'OMIT_CHROME_FRAME', | |
| 391 ], | |
| 392 }], | |
| 393 ], | 382 ], |
| 394 }, | 383 }, |
| 395 { | 384 { |
| 396 'target_name': 'setup_unittests', | 385 'target_name': 'setup_unittests', |
| 397 'type': 'executable', | 386 'type': 'executable', |
| 398 'dependencies': [ | 387 'dependencies': [ |
| 399 'installer_util', | 388 'installer_util', |
| 400 'installer_util_strings', | 389 'installer_util_strings', |
| 401 'launcher_support', | 390 'launcher_support', |
| 402 '../base/base.gyp:base', | 391 '../base/base.gyp:base', |
| 403 '../base/base.gyp:base_i18n', | 392 '../base/base.gyp:base_i18n', |
| 404 '../base/base.gyp:test_support_base', | 393 '../base/base.gyp:test_support_base', |
| 405 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', | |
| 406 '../testing/gmock.gyp:gmock', | 394 '../testing/gmock.gyp:gmock', |
| 407 '../testing/gtest.gyp:gtest', | 395 '../testing/gtest.gyp:gtest', |
| 408 ], | 396 ], |
| 409 'include_dirs': [ | 397 'include_dirs': [ |
| 410 '..', | 398 '..', |
| 411 '<(INTERMEDIATE_DIR)', | 399 '<(INTERMEDIATE_DIR)', |
| 412 ], | 400 ], |
| 413 # TODO(robertshield): Move the items marked with "Move to lib" | 401 # TODO(robertshield): Move the items marked with "Move to lib" |
| 414 # below into a separate lib and then link both setup.exe and | 402 # below into a separate lib and then link both setup.exe and |
| 415 # setup_unittests.exe against that. | 403 # setup_unittests.exe against that. |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1218 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1206 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1219 }, | 1207 }, |
| 1220 }, { # else branding!="Chrome" | 1208 }, { # else branding!="Chrome" |
| 1221 'variables': { | 1209 'variables': { |
| 1222 'branding_dir': 'app/theme/chromium', | 1210 'branding_dir': 'app/theme/chromium', |
| 1223 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1211 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1224 }, | 1212 }, |
| 1225 }], | 1213 }], |
| 1226 ], | 1214 ], |
| 1227 } | 1215 } |
| OLD | NEW |