Some linking fixes for GN build.

Add some content_shell targets. content_shell itself doesn't link yet so it's commented out, but some assocaited libs now compile.

This fixes a variety of out-of-date sources lists to get some targets closer to linking in the GN build.

Add xdisplaycheckk target

Update GYP files for GN names

Rename events_ipc

R=hclam@chromium.org

Review URL: https://codereview.chromium.org/407243002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284974 0039d316-1c4b-4281-b951-d872f2087c98

BUILD.gn

@@ -31,6 +31,7 @@ group("root") {
     "//chrome/utility",
     "//components:all_components",
     "//content",
+    "//content/shell:content_shell",
     "//crypto",
     "//device/bluetooth",
     "//device/nfc",
@@ -130,6 +131,10 @@ group("root") {
     ]
   }
 
+  if (use_x11) {
+    deps += [ "//tools/xdisplaycheck" ]
+  }
+
   if (is_win) {
     deps += [
       "//ui/metro_viewer",
@@ -165,6 +170,7 @@ group("root") {
       "//chrome/service",  # Blocked on content.
       "//chrome/utility",  # Blocked on content.
       "//content",
+      "//content/shell:content_shell",  # Blocked on content.
       "//extensions/common",
       "//extensions/common/api",
       "//pdf",  # Not compiled on Android in GYP yet, either.

content/browser/tracing/tracing_resources.gyp

@@ -9,6 +9,7 @@
   },
   'targets': [
     {
+      # GN version: //content/browser/tracing:generate_tracing_grd
       'target_name': 'generate_tracing_grd',
       'type': 'none',
       'dependencies': [
@@ -37,6 +38,7 @@
     },
 
     {
+      # GN version: //content/browser/tracing:resources
       'target_name': 'tracing_resources',
       'type': 'none',
       'dependencies': [

content/content.gyp

@@ -157,6 +157,7 @@
         ['OS != "ios"', {
           'targets': [
             {
+              # GN version: //content/child and //content/public/child
               'target_name': 'content_child',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -170,6 +171,7 @@
               'msvs_disabled_warnings': [ 4267, ],
             },
             {
+              # GN version: //content/gpu
               'target_name': 'content_gpu',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -182,6 +184,7 @@
               ],
             },
             {
+              # GN version: //content/plugin and //content/public/plugin
               'target_name': 'content_plugin',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -194,6 +197,7 @@
               ],
             },
             {
+              # GN version: //content/ppapi_plugin
               'target_name': 'content_ppapi_plugin',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -204,6 +208,7 @@
               'msvs_disabled_warnings': [ 4267, ],
             },
             {
+              # GN version: //content/renderer and //content/public/renderer
               'target_name': 'content_renderer',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -224,6 +229,7 @@
               ],
             },
             {
+              # GN version: //content/utility and //content/public/utility
               'target_name': 'content_utility',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },
@@ -236,6 +242,7 @@
               ],
             },
             {
+              # GN version: //content/worker
               'target_name': 'content_worker',
               'type': 'static_library',
               'variables': { 'enable_wexit_time_destructors': 1, },

content/content_resources.gyp

@@ -8,6 +8,7 @@
 {
   'targets': [
     {
+      # GN version: //content:resources
       'target_name': 'content_resources',
       'type': 'none',
       'variables': {

content/content_shell.gypi

@@ -19,6 +19,7 @@
   },
   'targets': [
     {
+      # GN version: //content/shell:content_shell_lib
       'target_name': 'content_shell_lib',
       'type': 'static_library',
       'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'],
@@ -68,6 +69,7 @@
         '..',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'shell/android/shell_jni_registrar.cc',
         'shell/android/shell_jni_registrar.h',
         'shell/android/shell_manager.cc',
@@ -246,11 +248,6 @@
         },
       },
       'conditions': [
-        ['OS=="mac"', {
-          'sources/': [
-            ['exclude', 'WebTestThemeEngineMock.cpp'],
-          ],
-        }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
@@ -274,10 +271,6 @@
           },
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
-        }, {  # OS!="win"
-          'sources/': [
-            ['exclude', 'Win\\.cpp$'],
-          ],
         }],  # OS=="win"
         ['OS=="linux"', {
           'dependencies': [
@@ -357,14 +350,15 @@
           ],
         }],
         ['enable_plugins==0', {
-          'sources/': [
-            ['exclude', 'shell/browser/shell_plugin_service_filter.cc'],
-            ['exclude', 'shell/browser/shell_plugin_service_filter.h'],
+          'sources!': [
+            'shell/browser/shell_plugin_service_filter.cc',
+            'shell/browser/shell_plugin_service_filter.h',
           ],
         }]
       ],
     },
     {
+      # GN version: //content/shell:resources
       'target_name': 'content_shell_resources',
       'type': 'none',
       'variables': {
@@ -431,9 +425,11 @@
     {
       # We build a minimal set of resources so WebKit in content_shell has
       # access to necessary resources.
+      # GN version: //content/shell:pak
       'target_name': 'content_shell_pak',
       'type': 'none',
       'dependencies': [
+        'browser/tracing/tracing_resources.gyp:tracing_resources',
         'content_resources.gyp:content_resources',
         'content_shell_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
@@ -443,11 +439,6 @@
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
       ],
       'conditions': [
-        ['OS!="android" and OS!="ios"', {
-          'dependencies': [
-            'browser/tracing/tracing_resources.gyp:tracing_resources',
-          ],
-        }],
         ['OS!="android"', {
           'dependencies': [
             'browser/devtools/devtools_resources.gyp:devtools_resources',
@@ -485,6 +476,7 @@
       ],
     },
     {
+      # GN version: //content/shell:content_shell
       'target_name': 'content_shell',
       'type': 'executable',
       'mac_bundle': 1,

content/public/plugin/BUILD.gn

@@ -6,4 +6,8 @@ source_set("plugin") {
   sources = [
     "content_plugin_client.h",
   ]
+
+  deps = [
+    "//content/plugin",
+  ]
 }

content/public/utility/BUILD.gn

@@ -15,6 +15,7 @@ source_set("utility") {
   deps = [
     "//base",
     "//content:export",
+    "//content/utility",
     "//ipc",
   ]
 }

content/test/BUILD.gn

@@ -50,6 +50,8 @@ static_library("test_support") {
       "//content/worker",
       "//cc",
       "//cc:test_support",
+      "//media",
+      "//ppapi:ppapi_host",
       "//ppapi:ppapi_proxy",
       "//ppapi:ppapi_shared",
       "//third_party/WebKit/public:blink",
@@ -60,8 +62,6 @@ static_library("test_support") {
       "//webkit/browser:storage",
       "//webkit/common:storage",
 # TODO(GYP)
-#"//media",
-#"//ppapi:host",
 #"//ppapi:unittest_shared",
     ]
 
@@ -92,15 +92,15 @@ static_library("test_support") {
     }
 
     if (use_glib) {
-      deps += [
-        "//build/linux/system:glib",
+      configs += [
+        "//build/config/linux:glib",
       ]
     }
 
     if (use_aura) {
       deps += [
         "//ui/aura:test_support",
-        "//ui/resources:test_pak",
+        "//ui/resources:ui_test_pak",
         "//ui/wm",
       ]
     }

ppapi/BUILD.gn

@@ -90,6 +90,8 @@ component("ppapi_shared") {
     "shared_impl/array_writer.h",
     "shared_impl/callback_tracker.cc",
     "shared_impl/callback_tracker.h",
+    "shared_impl/compositor_layer_data.cc",
+    "shared_impl/compositor_layer_data.h",
     "shared_impl/dictionary_var.cc",
     "shared_impl/dictionary_var.h",
     "shared_impl/file_io_state_manager.cc",
@@ -113,6 +115,8 @@ component("ppapi_shared") {
     "shared_impl/media_stream_buffer.h",
     "shared_impl/media_stream_buffer_manager.cc",
     "shared_impl/media_stream_buffer_manager.h",
+    "shared_impl/media_stream_audio_track_shared.cc",
+    "shared_impl/media_stream_audio_track_shared.h",
     "shared_impl/media_stream_video_track_shared.h",
     "shared_impl/media_stream_video_track_shared.cc",
     "shared_impl/platform_file.cc",
@@ -209,6 +213,10 @@ component("ppapi_shared") {
     "thunk/ppb_broker_api.h",
     "thunk/ppb_browser_font_trusted_api.h",
     "thunk/ppb_buffer_api.h",
+    "thunk/ppb_compositor_api.h",
+    "thunk/ppb_compositor_layer_api.h",
+    "thunk/ppb_compositor_layer_thunk.cc",
+    "thunk/ppb_compositor_thunk.cc",
     "thunk/ppb_console_thunk.cc",
     "thunk/ppb_cursor_control_thunk.cc",
     "thunk/ppb_device_ref_api.h",
@@ -249,6 +257,7 @@ component("ppapi_shared") {
     "thunk/ppb_image_data_thunk.cc",
     "thunk/ppb_input_event_api.h",
     "thunk/ppb_input_event_thunk.cc",
+    "thunk/ppb_input_event_private_thunk.cc",
     "thunk/ppb_instance_api.h",
     "thunk/ppb_instance_private_thunk.cc",
     "thunk/ppb_instance_thunk.cc",
@@ -304,8 +313,10 @@ component("ppapi_shared") {
     "thunk/ppb_var_array_thunk.cc",
     "thunk/ppb_var_dictionary_thunk.cc",
     "thunk/ppb_video_capture_api.h",
+    "thunk/ppb_video_capture_thunk.cc",
     "thunk/ppb_video_decoder_api.h",
     "thunk/ppb_video_decoder_dev_api.h",
+    "thunk/ppb_video_decoder_thunk.cc",
     "thunk/ppb_video_destination_private_api.h",
     "thunk/ppb_video_destination_private_thunk.cc",
     "thunk/ppb_video_frame_api.h",
@@ -357,7 +368,6 @@ component("ppapi_shared") {
       "thunk/ppb_scrollbar_thunk.cc",
       "thunk/ppb_talk_private_thunk.cc",
       "thunk/ppb_url_util_thunk.cc",
-      "thunk/ppb_video_capture_thunk.cc",
       "thunk/ppb_video_decoder_dev_thunk.cc",
     ]
   }
@@ -442,6 +452,7 @@ source_set("ppapi_ipc") {
     "//gpu/ipc",
     "//ipc",
     "//skia",
+    "//ui/events/ipc",
   ]
 
   if (is_nacl) {
@@ -463,6 +474,10 @@ component("ppapi_proxy") {
     "proxy/audio_buffer_resource.h",
     "proxy/broker_resource.cc",
     "proxy/broker_resource.h",
+    "proxy/compositor_layer_resource.cc",
+    "proxy/compositor_layer_resource.h",
+    "proxy/compositor_resource.cc",
+    "proxy/compositor_resource.h",
     "proxy/connection.h",
     "proxy/dispatcher.cc",
     "proxy/dispatcher.h",
@@ -504,6 +519,8 @@ component("ppapi_proxy") {
     "proxy/media_stream_track_resource_base.h",
     "proxy/media_stream_video_track_resource.cc",
     "proxy/media_stream_video_track_resource.h",
+    "proxy/message_handler.cc",
+    "proxy/message_handler.h",
     "proxy/net_address_resource.cc",
     "proxy/net_address_resource.h",
     "proxy/network_list_resource.cc",
@@ -686,6 +703,8 @@ component("ppapi_proxy") {
       "proxy/ppp_instance_private_proxy.h",
       "proxy/ppp_video_decoder_proxy.cc",
       "proxy/ppp_video_decoder_proxy.h",
+      "proxy/video_decoder_resource.cc",
+      "proxy/video_decoder_resource.h",
       "proxy/talk_resource.cc",
       "proxy/talk_resource.h",
       "proxy/video_capture_resource.cc",

tools/xdisplaycheck/BUILD.gn

+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+executable("xdisplaycheck") {
+  sources = [
+    "xdisplaycheck.cc",
+  ]
+
+  configs += [
+    "//build/config/linux:x11"
+  ]
+}

tools/xdisplaycheck/xdisplaycheck.gyp

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //tools/xdisplaycheck
       'target_name': 'xdisplaycheck',
       'type': 'executable',
       'dependencies': [

ui/events/ipc/BUILD.gn

@@ -4,8 +4,9 @@
 
 import("//build/config/ui.gni")
 
-component("events_ipc") {
- sources = [
+component("ipc") {
+  output_name = "events_ipc"
+  sources = [
     "latency_info_param_traits.cc",
     "latency_info_param_traits.h",
   ]

ui/events/ipc/events_ipc.gyp

@@ -7,7 +7,8 @@
     'chromium_code': 1,
   },
   'targets': [
-     {
+    {
+      # GN version: //ui/events/ipc
       'target_name': 'events_ipc',
       'type': '<(component)',
       'dependencies': [