projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git] / src / content / content_shell.gypi
diff --git a/src/content/content_shell.gypi b/src/content/content_shell.gypi
index e0969dd..b16ed23 100644 (file)
--- a/src/content/content_shell.gypi
+++ b/src/content/content_shell.gypi
@@ -27,6 +27,7 @@
         'chromium_code': 1,
       },
       'dependencies': [
+        'app/resources/content_resources.gyp:content_resources',
         'app/strings/content_strings.gyp:content_strings',
         'content.gyp:content_app_both',
         'content.gyp:content_browser',
@@ -35,23 +36,27 @@
         'content.gyp:content_plugin',
         'content.gyp:content_ppapi_plugin',
         'content.gyp:content_renderer',
+        'content.gyp:content_resources',
         'content.gyp:content_utility',
-        'content_resources.gyp:content_resources',
         'content_shell_resources',
         'copy_test_netscape_plugin',
         'layouttest_support_content',
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../cc/blink/cc_blink.gyp:cc_blink',
         '../cc/cc.gyp:cc',
-        '../components/components.gyp:breakpad_component',
+        '../components/components.gyp:crash_component',
+        '../components/components.gyp:web_cache_renderer',
         '../gin/gin.gyp:gin',
         '../gpu/gpu.gyp:gpu',
         '../ipc/ipc.gyp:ipc',
+        '../media/blink/media_blink.gyp:media_blink',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
+        '../storage/storage_browser.gyp:storage',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../third_party/WebKit/public/blink.gyp:blink_test_support',
         '../ui/base/ui_base.gyp:ui_base',
@@ -62,8 +67,6 @@
         '../ui/gl/gl.gyp:gl',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/storage_browser.gyp:webkit_storage_browser',
-        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
@@ -76,8 +79,8 @@
         'shell/android/shell_manager.h',
         'shell/app/paths_mac.h',
         'shell/app/paths_mac.mm',
-        'shell/app/shell_breakpad_client.cc',
-        'shell/app/shell_breakpad_client.h',
+        'shell/app/shell_crash_reporter_client.cc',
+        'shell/app/shell_crash_reporter_client.h',
         'shell/app/shell_main_delegate.cc',
         'shell/app/shell_main_delegate.h',
         'shell/app/shell_main_delegate_mac.h',
@@ -87,6 +90,8 @@
         'shell/app/webkit_test_platform_support_linux.cc',
         'shell/app/webkit_test_platform_support_mac.mm',
         'shell/app/webkit_test_platform_support_win.cc',
+        'shell/browser/ipc_echo_message_filter.cc',
+        'shell/browser/ipc_echo_message_filter.h',
         'shell/browser/notify_done_forwarder.cc',
         'shell/browser/notify_done_forwarder.h',
         'shell/browser/shell_android.cc',
@@ -166,6 +171,8 @@
         'shell/geolocation/shell_access_token_store.h',
         'shell/renderer/gc_controller.cc',
         'shell/renderer/gc_controller.h',
+        'shell/renderer/ipc_echo.cc',
+        'shell/renderer/ipc_echo.h',
         'shell/renderer/leak_detector.cc',
         'shell/renderer/leak_detector.h',
         'shell/renderer/shell_content_renderer_client.cc',
@@ -176,13 +183,6 @@
         'shell/renderer/shell_render_process_observer.h',
         'shell/renderer/shell_render_view_observer.cc',
         'shell/renderer/shell_render_view_observer.h',
-        'shell/renderer/test_runner/TestPlugin.cpp',
-        'shell/renderer/test_runner/TestPlugin.h',
-        'shell/renderer/test_runner/WebTask.cpp',
-        'shell/renderer/test_runner/WebTask.h',
-        'shell/renderer/test_runner/WebTestDelegate.h',
-        'shell/renderer/test_runner/WebTestInterfaces.cpp',
-        'shell/renderer/test_runner/WebTestInterfaces.h',
         'shell/renderer/test_runner/accessibility_controller.cc',
         'shell/renderer/test_runner/accessibility_controller.h',
         'shell/renderer/test_runner/event_sender.cc',
@@ -191,6 +191,8 @@
         'shell/renderer/test_runner/gamepad_controller.h',
         'shell/renderer/test_runner/mock_color_chooser.cc',
         'shell/renderer/test_runner/mock_color_chooser.h',
+        'shell/renderer/test_runner/mock_credential_manager_client.cc',
+        'shell/renderer/test_runner/mock_credential_manager_client.h',
         'shell/renderer/test_runner/mock_constraints.cc',
         'shell/renderer/test_runner/mock_constraints.h',
         'shell/renderer/test_runner/mock_grammar_check.cc',
@@ -229,6 +231,8 @@
         'shell/renderer/test_runner/test_common.h',
         'shell/renderer/test_runner/test_interfaces.cc',
         'shell/renderer/test_runner/test_interfaces.h',
+        'shell/renderer/test_runner/test_plugin.cc',
+        'shell/renderer/test_runner/test_plugin.h',
         'shell/renderer/test_runner/test_runner.cc',
         'shell/renderer/test_runner/test_runner.h',
         'shell/renderer/test_runner/text_input_controller.cc',
@@ -238,6 +242,11 @@
         'shell/renderer/test_runner/web_frame_test_proxy.h',
         'shell/renderer/test_runner/web_permissions.cc',
         'shell/renderer/test_runner/web_permissions.h',
+        'shell/renderer/test_runner/web_task.cc',
+        'shell/renderer/test_runner/web_task.h',
+        'shell/renderer/test_runner/web_test_delegate.h',
+        'shell/renderer/test_runner/web_test_interfaces.cc',
+        'shell/renderer/test_runner/web_test_interfaces.h',
         'shell/renderer/test_runner/web_test_proxy.cc',
         'shell/renderer/test_runner/web_test_proxy.h',
         'shell/renderer/test_runner/web_test_runner.h',
@@ -431,15 +440,15 @@
       'target_name': 'content_shell_pak',
       'type': 'none',
       'dependencies': [
+        'app/resources/content_resources.gyp:content_resources',
         'app/strings/content_strings.gyp:content_strings',
         'browser/tracing/tracing_resources.gyp:tracing_resources',
-        'content_resources.gyp:content_resources',
+        'content.gyp:content_resources',
         'content_shell_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'conditions': [
         ['OS!="android"', {
@@ -447,6 +456,16 @@
             'browser/devtools/devtools_resources.gyp:devtools_resources',
           ],
         }],
+        ['OS=="android"', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'
+              ],
+            },
+          ],
+        }],
       ],
       'actions': [
         {
@@ -454,6 +473,7 @@
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
@@ -463,7 +483,6 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
             ],
             'conditions': [
               ['OS!="android"', {
@@ -496,7 +515,6 @@
         '..',
       ],
       'sources': [
-        'app/startup_helper_win.cc',
         'shell/app/shell_main.cc',
       ],
       'mac_bundle_resources': [
Domain: Web Framework / Uncategorized;