| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 '--output_dir=<(PRODUCT_DIR)', | 352 '--output_dir=<(PRODUCT_DIR)', |
| 353 '--input_file=<(RULE_INPUT_PATH)', | 353 '--input_file=<(RULE_INPUT_PATH)', |
| 354 '--header_output_dir=<(INTERMEDIATE_DIR)', | 354 '--header_output_dir=<(INTERMEDIATE_DIR)', |
| 355 # TODO(sgk): may just use environment variables | 355 # TODO(sgk): may just use environment variables |
| 356 #'--distribution=$(CHROMIUM_BUILD)', | 356 #'--distribution=$(CHROMIUM_BUILD)', |
| 357 '--distribution=_google_chrome', | 357 '--distribution=_google_chrome', |
| 358 ], | 358 ], |
| 359 }, | 359 }, |
| 360 ], | 360 ], |
| 361 'conditions': [ | 361 'conditions': [ |
| 362 ['component == "shared_library"', { | |
| 363 'variables': { | |
| 364 'win_use_external_manifest': 1, | |
| 365 }, | |
| 366 }], | |
| 367 # TODO(mark): <(branding_dir) should be defined by the | 362 # TODO(mark): <(branding_dir) should be defined by the |
| 368 # global condition block at the bottom of the file, but | 363 # global condition block at the bottom of the file, but |
| 369 # this doesn't work due to the following issue: | 364 # this doesn't work due to the following issue: |
| 370 # | 365 # |
| 371 # http://code.google.com/p/gyp/issues/detail?id=22 | 366 # http://code.google.com/p/gyp/issues/detail?id=22 |
| 372 # | 367 # |
| 373 # Remove this block once the above issue is fixed. | 368 # Remove this block once the above issue is fixed. |
| 374 [ 'branding == "Chrome"', { | 369 [ 'branding == "Chrome"', { |
| 375 'variables': { | 370 'variables': { |
| 376 'branding_dir': 'app/theme/google_chrome', | 371 'branding_dir': 'app/theme/google_chrome', |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1214 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1209 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1215 }, | 1210 }, |
| 1216 }, { # else branding!="Chrome" | 1211 }, { # else branding!="Chrome" |
| 1217 'variables': { | 1212 'variables': { |
| 1218 'branding_dir': 'app/theme/chromium', | 1213 'branding_dir': 'app/theme/chromium', |
| 1219 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1214 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1220 }, | 1215 }, |
| 1221 }], | 1216 }], |
| 1222 ], | 1217 ], |
| 1223 } | 1218 } |
| OLD | NEW |