Chromium Code Reviews| 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 'content_shell_product_name': 'Content Shell', | 7 'content_shell_product_name': 'Content Shell', |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 '../net/net.gyp:net', | 34 '../net/net.gyp:net', |
| 35 '../skia/skia.gyp:skia', | 35 '../skia/skia.gyp:skia', |
| 36 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 36 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
| 37 '../ui/ui.gyp:ui', | 37 '../ui/ui.gyp:ui', |
| 38 '../v8/tools/gyp/v8.gyp:v8', | 38 '../v8/tools/gyp/v8.gyp:v8', |
| 39 '../webkit/support/webkit_support.gyp:appcache', | 39 '../webkit/support/webkit_support.gyp:appcache', |
| 40 '../webkit/support/webkit_support.gyp:database', | 40 '../webkit/support/webkit_support.gyp:database', |
| 41 '../webkit/support/webkit_support.gyp:fileapi', | 41 '../webkit/support/webkit_support.gyp:fileapi', |
| 42 '../webkit/support/webkit_support.gyp:glue', | 42 '../webkit/support/webkit_support.gyp:glue', |
| 43 '../webkit/support/webkit_support.gyp:quota', | 43 '../webkit/support/webkit_support.gyp:quota', |
| 44 '../webkit/support/webkit_support.gyp:webkit_support', | |
| 45 ], | 44 ], |
| 46 'include_dirs': [ | 45 'include_dirs': [ |
| 47 '..', | 46 '..', |
| 48 ], | 47 ], |
| 49 'sources': [ | 48 'sources': [ |
| 50 'shell/layout_test_controller_bindings.cc', | 49 'shell/layout_test_controller_bindings.cc', |
| 51 'shell/layout_test_controller_bindings.h', | 50 'shell/layout_test_controller_bindings.h', |
| 52 'shell/paths_mac.h', | 51 'shell/paths_mac.h', |
| 53 'shell/paths_mac.mm', | 52 'shell/paths_mac.mm', |
| 54 'shell/shell.cc', | 53 'shell/shell.cc', |
| 55 'shell/shell.h', | 54 'shell/shell.h', |
| 55 'shell/shell_android.cc', | |
| 56 'shell/shell_aura.cc', | 56 'shell/shell_aura.cc', |
| 57 'shell/shell_gtk.cc', | 57 'shell/shell_gtk.cc', |
| 58 'shell/shell_mac.mm', | 58 'shell/shell_mac.mm', |
| 59 'shell/shell_win.cc', | 59 'shell/shell_win.cc', |
| 60 'shell/shell_application_mac.h', | 60 'shell/shell_application_mac.h', |
| 61 'shell/shell_application_mac.mm', | 61 'shell/shell_application_mac.mm', |
| 62 'shell/shell_browser_context.cc', | 62 'shell/shell_browser_context.cc', |
| 63 'shell/shell_browser_context.h', | 63 'shell/shell_browser_context.h', |
| 64 'shell/shell_browser_main.cc', | 64 'shell/shell_browser_main.cc', |
| 65 'shell/shell_browser_main.h', | 65 'shell/shell_browser_main.h', |
| 66 'shell/shell_browser_main_parts.cc', | 66 'shell/shell_browser_main_parts.cc', |
| 67 'shell/shell_browser_main_parts.h', | 67 'shell/shell_browser_main_parts.h', |
| 68 'shell/shell_browser_main_parts_android.cc', | |
| 69 'shell/shell_browser_main_parts_android.h', | |
| 68 'shell/shell_browser_main_parts_mac.mm', | 70 'shell/shell_browser_main_parts_mac.mm', |
| 69 'shell/shell_content_browser_client.cc', | 71 'shell/shell_content_browser_client.cc', |
| 70 'shell/shell_content_browser_client.h', | 72 'shell/shell_content_browser_client.h', |
| 71 'shell/shell_content_client.cc', | 73 'shell/shell_content_client.cc', |
| 72 'shell/shell_content_client.h', | 74 'shell/shell_content_client.h', |
| 73 'shell/shell_content_plugin_client.cc', | 75 'shell/shell_content_plugin_client.cc', |
| 74 'shell/shell_content_plugin_client.h', | 76 'shell/shell_content_plugin_client.h', |
| 75 'shell/shell_content_renderer_client.cc', | 77 'shell/shell_content_renderer_client.cc', |
| 76 'shell/shell_content_renderer_client.h', | 78 'shell/shell_content_renderer_client.h', |
| 77 'shell/shell_content_utility_client.cc', | 79 'shell/shell_content_utility_client.cc', |
| 78 'shell/shell_content_utility_client.h', | 80 'shell/shell_content_utility_client.h', |
| 79 'shell/shell_devtools_delegate.cc', | 81 'shell/shell_devtools_delegate.cc', |
| 80 'shell/shell_devtools_delegate.h', | 82 'shell/shell_devtools_delegate.h', |
| 81 'shell/shell_download_manager_delegate.cc', | 83 'shell/shell_download_manager_delegate.cc', |
| 82 'shell/shell_download_manager_delegate.h', | 84 'shell/shell_download_manager_delegate.h', |
| 83 'shell/shell_javascript_dialog_creator.cc', | 85 'shell/shell_javascript_dialog_creator.cc', |
| 84 'shell/shell_javascript_dialog_creator.h', | 86 'shell/shell_javascript_dialog_creator.h', |
| 85 'shell/shell_javascript_dialog_mac.mm', | 87 'shell/shell_javascript_dialog_mac.mm', |
| 86 'shell/shell_javascript_dialog_win.cc', | 88 'shell/shell_javascript_dialog_win.cc', |
| 87 'shell/shell_javascript_dialog.h', | 89 'shell/shell_javascript_dialog.h', |
| 88 'shell/shell_login_dialog_mac.mm', | 90 'shell/shell_login_dialog_mac.mm', |
| 89 'shell/shell_login_dialog.cc', | 91 'shell/shell_login_dialog.cc', |
| 90 'shell/shell_login_dialog.h', | 92 'shell/shell_login_dialog.h', |
| 91 'shell/shell_main_delegate.cc', | 93 'shell/shell_main_delegate.cc', |
| 92 'shell/shell_main_delegate.h', | 94 'shell/shell_main_delegate.h', |
| 95 'shell/shell_main_delegate_android.cc', | |
| 96 'shell/shell_main_delegate_android.h', | |
| 93 'shell/shell_messages.cc', | 97 'shell/shell_messages.cc', |
| 94 'shell/shell_messages.h', | 98 'shell/shell_messages.h', |
| 95 'shell/shell_network_delegate.cc', | 99 'shell/shell_network_delegate.cc', |
| 96 'shell/shell_network_delegate.h', | 100 'shell/shell_network_delegate.h', |
| 97 'shell/shell_render_process_observer.cc', | 101 'shell/shell_render_process_observer.cc', |
| 98 'shell/shell_render_process_observer.h', | 102 'shell/shell_render_process_observer.h', |
| 99 'shell/shell_render_view_host_observer.cc', | 103 'shell/shell_render_view_host_observer.cc', |
| 100 'shell/shell_render_view_host_observer.h', | 104 'shell/shell_render_view_host_observer.h', |
| 101 'shell/shell_render_view_observer.cc', | 105 'shell/shell_render_view_observer.cc', |
| 102 'shell/shell_render_view_observer.h', | 106 'shell/shell_render_view_observer.h', |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 131 'configurations': { | 135 'configurations': { |
| 132 'Debug_Base': { | 136 'Debug_Base': { |
| 133 'msvs_settings': { | 137 'msvs_settings': { |
| 134 'VCLinkerTool': { | 138 'VCLinkerTool': { |
| 135 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 139 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 136 }, | 140 }, |
| 137 }, | 141 }, |
| 138 }, | 142 }, |
| 139 }, | 143 }, |
| 140 }], # OS=="win" | 144 }], # OS=="win" |
| 145 ['OS!="android"', { | |
| 146 'dependencies': [ | |
| 147 # This dependency is for running DRT against the content shell, and | |
| 148 # this combination is not yet supported on Android. | |
| 149 '../webkit/support/webkit_support.gyp:webkit_support', | |
| 150 ], | |
| 151 }], # OS!="android" | |
| 141 ['use_aura==1', { | 152 ['use_aura==1', { |
| 142 'sources/': [ | 153 'sources/': [ |
| 143 ['exclude', 'shell/shell_gtk.cc'], | 154 ['exclude', 'shell/shell_gtk.cc'], |
| 144 ['exclude', 'shell/shell_win.cc'], | 155 ['exclude', 'shell/shell_win.cc'], |
| 145 ], | 156 ], |
| 146 }], | 157 }], |
| 147 ], | 158 ], |
| 148 }, | 159 }, |
| 149 { | 160 { |
| 150 'target_name': 'content_shell_resources', | 161 'target_name': 'content_shell_resources', |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 215 'pak_inputs': [ | 226 'pak_inputs': [ |
| 216 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', | 227 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', |
| 217 ] | 228 ] |
| 218 }], | 229 }], |
| 219 ], | 230 ], |
| 220 }, | 231 }, |
| 221 'inputs': [ | 232 'inputs': [ |
| 222 '<(repack_path)', | 233 '<(repack_path)', |
| 223 '<@(pak_inputs)', | 234 '<@(pak_inputs)', |
| 224 ], | 235 ], |
| 225 'outputs': [ | |
| 226 '<(PRODUCT_DIR)/content_shell.pak', | |
| 227 ], | |
| 228 'action': ['python', '<(repack_path)', '<@(_outputs)', | 236 'action': ['python', '<(repack_path)', '<@(_outputs)', |
| 229 '<@(pak_inputs)'], | 237 '<@(pak_inputs)'], |
| 238 'conditions': [ | |
| 239 ['OS!="android"', { | |
| 240 'outputs': [ | |
| 241 '<(PRODUCT_DIR)/content_shell.pak', | |
| 242 ], | |
| 243 }, { | |
| 244 'outputs': [ | |
| 245 '<(PRODUCT_DIR)/../assets/content_shell/content_shell.pak', | |
| 246 ], | |
| 247 }], | |
| 248 ], | |
| 230 }, | 249 }, |
| 231 ], | 250 ], |
| 232 }, | 251 }, |
| 233 { | 252 { |
| 234 'target_name': 'content_shell', | 253 'target_name': 'content_shell', |
| 235 'type': 'executable', | 254 'type': 'executable', |
| 236 'mac_bundle': 1, | 255 'mac_bundle': 1, |
| 237 'defines!': ['CONTENT_IMPLEMENTATION'], | 256 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 238 'variables': { | 257 'variables': { |
| 239 'chromium_code': 1, | 258 'chromium_code': 1, |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 455 '../build/mac/verify_no_objc.sh', | 474 '../build/mac/verify_no_objc.sh', |
| 456 ], | 475 ], |
| 457 }, | 476 }, |
| 458 ], | 477 ], |
| 459 }, # target content_shell_helper_app | 478 }, # target content_shell_helper_app |
| 460 ], | 479 ], |
| 461 }], # OS=="mac" | 480 }], # OS=="mac" |
| 462 ['OS=="android"', { | 481 ['OS=="android"', { |
| 463 'targets': [ | 482 'targets': [ |
| 464 { | 483 { |
| 484 'target_name': 'content_shell_jni_headers', | |
| 485 'type': 'none', | |
| 486 'variables': { | |
| 487 'java_sources': [ | |
| 488 'shell/android/java/org/chromium/content_shell/ShellManager.java', | |
| 489 'shell/android/java/org/chromium/content_shell/ShellView.java', | |
| 490 ], | |
| 491 'jni_headers': [ | |
| 492 '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_manager_jni.h' , | |
| 493 '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_view_jni.h', | |
| 494 ], | |
| 495 }, | |
| 496 'includes': [ '../build/jni_generator.gypi' ], | |
| 497 }, | |
| 498 { | |
| 499 'target_name': 'content_shell_content_view', | |
| 500 'type': 'shared_library', | |
| 501 'dependencies': [ | |
| 502 'content_shell_jni_headers', | |
| 503 'content_shell_lib', | |
| 504 'content_shell_pak', | |
| 505 # Skia is necessary to ensure the dependencies needed by | |
| 506 # WebContents are included. | |
| 507 '../skia/skia.gyp:skia', | |
| 508 ], | |
| 509 'include_dirs': [ | |
| 510 '<(SHARED_INTERMEDIATE_DIR)/content/shell', | |
| 511 ], | |
| 512 'sources': [ | |
| 513 'shell/android/shell_library_loader.cc', | |
| 514 'shell/android/shell_library_loader.h', | |
| 515 'shell/android/shell_manager.cc', | |
| 516 'shell/android/shell_manager.h', | |
| 517 'shell/android/shell_view.cc', | |
| 518 'shell/android/shell_view.h', | |
| 519 ], | |
| 520 }, | |
| 521 { | |
| 465 'target_name': 'content_shell_apk', | 522 'target_name': 'content_shell_apk', |
| 466 'type': 'none', | 523 'type': 'none', |
| 524 # TODO(tedchoc): Add a dependency on content_shell_content_view once | |
| 525 # it links. | |
| 467 'actions': [ | 526 'actions': [ |
| 468 { | 527 { |
| 528 'action_name': 'copy_base_jar', | |
| 529 'dependencies': [ | |
| 530 '<(DEPTH)/base/android/java/java.gyp:base_java', | |
| 531 ], | |
| 532 'inputs': ['<(DEPTH)/base/android/java/dist/lib/chromium_base.jar' ], | |
|
Yaron
2012/04/19 00:35:34
Note that these are all moving to PRODUCT_DIR in t
Ted C
2012/04/19 01:17:07
Will update once the other patch lands. They do n
| |
| 533 'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_base. jar'], | |
| 534 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | |
| 535 }, | |
| 536 { | |
| 537 'action_name': 'copy_content_jar', | |
| 538 'dependencies': [ | |
| 539 '<(DEPTH)/content/content.gyp:content_java', | |
| 540 ], | |
| 541 'inputs': ['<(DEPTH)/content/android/java/dist/lib/chromium_conten t.jar'], | |
| 542 'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_conte nt.jar'], | |
| 543 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | |
| 544 }, | |
| 545 { | |
| 469 'action_name': 'content_shell_apk', | 546 'action_name': 'content_shell_apk', |
| 470 'inputs': [ | 547 'inputs': [ |
| 471 '<(DEPTH)/content/shell/android/content_shell_apk.xml', | 548 '<(DEPTH)/content/shell/android/content_shell_apk.xml', |
| 472 '<!@(find shell/android/java -name "*.java")', | 549 '<!@(find shell/android/java -name "*.java")', |
| 473 ], | 550 ], |
| 474 'outputs': [ | 551 'outputs': [ |
| 475 # Awkwardly, we build a Debug APK even when gyp is in | 552 # Awkwardly, we build a Debug APK even when gyp is in |
| 476 # Release mode. I don't think it matters (e.g. we're | 553 # Release mode. I don't think it matters (e.g. we're |
| 477 # probably happy to not codesign) but naming should be | 554 # probably happy to not codesign) but naming should be |
| 478 # fixed. | 555 # fixed. |
| 479 '<(PRODUCT_DIR)/ContentShell-debug.apk', | 556 '<(PRODUCT_DIR)/ContentShell-debug.apk', |
| 480 ], | 557 ], |
| 558 'dependencies': [ | |
| 559 'copy_base_jar', | |
| 560 'copy_content_jar', | |
| 561 ], | |
| 481 'action': [ | 562 'action': [ |
| 482 'ant', | 563 'ant', |
| 483 '-DPRODUCT_DIR=<(PRODUCT_DIR)', | 564 '-DPRODUCT_DIR=<(PRODUCT_DIR)', |
| 484 '-buildfile', | 565 '-buildfile', |
| 485 '<(DEPTH)/content/shell/android/content_shell_apk.xml', | 566 '<(DEPTH)/content/shell/android/content_shell_apk.xml', |
| 486 ] | 567 ] |
| 487 } | 568 } |
| 488 ], | 569 ], |
| 489 }, | 570 }, |
| 490 ], | 571 ], |
| 491 }], # OS=="android" | 572 }], # OS=="android" |
| 492 ] | 573 ] |
| 493 } | 574 } |
| OLD | NEW |