| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'variables': { | 9 'variables': { |
| 10 'version_py_path': 'tools/build/version.py', | 10 'version_py_path': 'tools/build/version.py', |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOC
ALE.pak\' <(locales))', | 335 '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOC
ALE.pak\' <(locales))', |
| 336 # TODO(bradnelson): move to something like this | 336 # TODO(bradnelson): move to something like this |
| 337 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_string
s_grds))', | 337 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_string
s_grds))', |
| 338 # See comment in chrome_resources as to why. | 338 # See comment in chrome_resources as to why. |
| 339 ], | 339 ], |
| 340 'action': ['python', '../tools/grit/grit.py', '-i', | 340 'action': ['python', '../tools/grit/grit.py', '-i', |
| 341 '<(RULE_INPUT_PATH)', | 341 '<(RULE_INPUT_PATH)', |
| 342 'build', '-o', '<(grit_out_dir)', | 342 'build', '-o', '<(grit_out_dir)', |
| 343 '-D', '<(chrome_build)'], | 343 '-D', '<(chrome_build)'], |
| 344 'conditions': [ | 344 'conditions': [ |
| 345 ['chromeos==1', { | 345 ['chromeos==1 or toolkit_views==1', { |
| 346 'action': ['-D', 'chromeos'], | 346 'action': ['-D', 'chromeos'], |
| 347 }], | 347 }], |
| 348 ['use_titlecase_in_grd_files==1', { | 348 ['use_titlecase_in_grd_files==1', { |
| 349 'action': ['-D', 'use_titlecase'], | 349 'action': ['-D', 'use_titlecase'], |
| 350 }], | 350 }], |
| 351 ], | 351 ], |
| 352 'message': 'Generating resources from <(RULE_INPUT_PATH)', | 352 'message': 'Generating resources from <(RULE_INPUT_PATH)', |
| 353 }, | 353 }, |
| 354 ], | 354 ], |
| 355 'sources': [ | 355 'sources': [ |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 'outputs': [ | 392 'outputs': [ |
| 393 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', | 393 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', |
| 394 ], | 394 ], |
| 395 'action': [ | 395 'action': [ |
| 396 'python', '<(grit_path)', | 396 'python', '<(grit_path)', |
| 397 '-i', '<(input_path)', 'build', | 397 '-i', '<(input_path)', 'build', |
| 398 '-o', '<(grit_out_dir)', | 398 '-o', '<(grit_out_dir)', |
| 399 '-D', '<(chrome_build)' | 399 '-D', '<(chrome_build)' |
| 400 ], | 400 ], |
| 401 'conditions': [ | 401 'conditions': [ |
| 402 ['chromeos==1', { | 402 ['chromeos==1 or toolkit_views==1', { |
| 403 'action': ['-D', 'chromeos'], | 403 'action': ['-D', 'chromeos'], |
| 404 }], | 404 }], |
| 405 ['use_titlecase_in_grd_files==1', { | 405 ['use_titlecase_in_grd_files==1', { |
| 406 'action': ['-D', 'use_titlecase'], | 406 'action': ['-D', 'use_titlecase'], |
| 407 }], | 407 }], |
| 408 ], | 408 ], |
| 409 'message': 'Generating resources from <(input_path)', | 409 'message': 'Generating resources from <(input_path)', |
| 410 }, | 410 }, |
| 411 ], | 411 ], |
| 412 'direct_dependent_settings': { | 412 'direct_dependent_settings': { |
| (...skipping 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2356 | 2356 |
| 2357 # This file is generated by GRIT. | 2357 # This file is generated by GRIT. |
| 2358 '<(grit_out_dir)/grit/theme_resources_map.cc', | 2358 '<(grit_out_dir)/grit/theme_resources_map.cc', |
| 2359 ], | 2359 ], |
| 2360 'conditions': [ | 2360 'conditions': [ |
| 2361 ['javascript_engine=="v8"', { | 2361 ['javascript_engine=="v8"', { |
| 2362 'defines': [ | 2362 'defines': [ |
| 2363 'CHROME_V8', | 2363 'CHROME_V8', |
| 2364 ], | 2364 ], |
| 2365 }], | 2365 }], |
| 2366 ['chromeos==0', { | 2366 ['chromeos==0 and toolkit_views==0', { |
| 2367 'sources/': [ | 2367 'sources/': [ |
| 2368 ['exclude', '^browser/chromeos'], | 2368 ['exclude', '^browser/chromeos'], |
| 2369 ], | 2369 ], |
| 2370 }], | 2370 }], |
| 2371 ['OS=="linux"', { | 2371 ['OS=="linux"', { |
| 2372 'dependencies': [ | 2372 'dependencies': [ |
| 2373 # Temporarily disabled while we figure some stuff out. | 2373 # Temporarily disabled while we figure some stuff out. |
| 2374 # http://code.google.com/p/chromium/issues/detail?id=12351 | 2374 # http://code.google.com/p/chromium/issues/detail?id=12351 |
| 2375 # '../build/linux/system.gyp:dbus-glib', | 2375 # '../build/linux/system.gyp:dbus-glib', |
| 2376 # '../build/linux/system.gyp:gnome-keyring', | 2376 # '../build/linux/system.gyp:gnome-keyring', |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2802 # Overlaps with browser/views/frame/browser_view.cc | 2802 # Overlaps with browser/views/frame/browser_view.cc |
| 2803 ['exclude', '^browser/browser_list_gtk.cc'], | 2803 ['exclude', '^browser/browser_list_gtk.cc'], |
| 2804 ], | 2804 ], |
| 2805 }], | 2805 }], |
| 2806 ['OS=="linux" and toolkit_views==0', { | 2806 ['OS=="linux" and toolkit_views==0', { |
| 2807 'sources/': [ | 2807 'sources/': [ |
| 2808 ['include', '^browser/printing/print_dialog_gtk.cc'], | 2808 ['include', '^browser/printing/print_dialog_gtk.cc'], |
| 2809 ['include', '^browser/printing/print_dialog_gtk.h'], | 2809 ['include', '^browser/printing/print_dialog_gtk.h'], |
| 2810 ], | 2810 ], |
| 2811 }], | 2811 }], |
| 2812 ['chromeos==1',{ | 2812 ['chromeos==1 or toolkit_views==1',{ |
| 2813 'dependencies': [ | 2813 'dependencies': [ |
| 2814 '../third_party/protobuf2/protobuf.gyp:protobuf_lite', | 2814 '../third_party/protobuf2/protobuf.gyp:protobuf_lite', |
| 2815 '../third_party/protobuf2/protobuf.gyp:protoc', | 2815 '../third_party/protobuf2/protobuf.gyp:protoc', |
| 2816 '../third_party/cros/cros_api.gyp:cros_api', | 2816 '../third_party/cros/cros_api.gyp:cros_api', |
| 2817 ], | 2817 ], |
| 2818 'actions': [ | 2818 'actions': [ |
| 2819 { | 2819 { |
| 2820 'action_name': 'my_proto', | 2820 'action_name': 'my_proto', |
| 2821 'inputs': [ | 2821 'inputs': [ |
| 2822 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFI
X)', | 2822 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFI
X)', |
| (...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4420 'test/file_test_utils.cc', | 4420 'test/file_test_utils.cc', |
| 4421 'test/render_view_test.cc', | 4421 'test/render_view_test.cc', |
| 4422 'test/render_view_test.h', | 4422 'test/render_view_test.h', |
| 4423 'test/test_notification_tracker.cc', | 4423 'test/test_notification_tracker.cc', |
| 4424 'test/test_notification_tracker.h', | 4424 'test/test_notification_tracker.h', |
| 4425 'test/v8_unit_test.cc', | 4425 'test/v8_unit_test.cc', |
| 4426 'test/v8_unit_test.h', | 4426 'test/v8_unit_test.h', |
| 4427 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/comp
act_lang_det_unittest_small.cc', | 4427 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/comp
act_lang_det_unittest_small.cc', |
| 4428 ], | 4428 ], |
| 4429 'conditions': [ | 4429 'conditions': [ |
| 4430 ['chromeos==0', { | 4430 ['chromeos==0 and toolkit_views==0', { |
| 4431 'sources/': [ | 4431 'sources/': [ |
| 4432 ['exclude', '^browser/chromeos'], | 4432 ['exclude', '^browser/chromeos'], |
| 4433 ], | 4433 ], |
| 4434 }], | 4434 }], |
| 4435 ['OS=="linux" and selinux==0', { | 4435 ['OS=="linux" and selinux==0', { |
| 4436 'dependencies': [ | 4436 'dependencies': [ |
| 4437 '../sandbox/sandbox.gyp:*', | 4437 '../sandbox/sandbox.gyp:*', |
| 4438 ], | 4438 ], |
| 4439 }], | 4439 }], |
| 4440 ['OS=="linux"', { | 4440 ['OS=="linux"', { |
| (...skipping 2466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6907 ], # targets when chrome_personalization==1 | 6907 ], # targets when chrome_personalization==1 |
| 6908 }], | 6908 }], |
| 6909 ], # 'conditions' | 6909 ], # 'conditions' |
| 6910 } | 6910 } |
| 6911 | 6911 |
| 6912 # Local Variables: | 6912 # Local Variables: |
| 6913 # tab-width:2 | 6913 # tab-width:2 |
| 6914 # indent-tabs-mode:nil | 6914 # indent-tabs-mode:nil |
| 6915 # End: | 6915 # End: |
| 6916 # vim: set expandtab tabstop=2 shiftwidth=2: | 6916 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |