roll up of misc. gn work

ppapi/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.
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("ppapi_sources.gypi") ],
                           "scope",
                           [ "ppapi_sources.gypi" ])
 
 # TODO(GYP) support chrome_multiple_dll
@@ skipping 76 matching lines @@
 #
 #  defines = [ "GL_GLEXT_PROTOTYPES" ]
 #  include_dirs = [ "lib/gl/include" ]
 #
 #  deps = [
 #    ":ppapi_cpp",
 #    ":ppapi_shared",
 #  ]
 #}
 
+if (is_nacl) {
+  gypi_values = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("ppapi_sources.gypi") ],
+                            "scope",
+                            [ "ppapi_sources.gypi" ])
+
+  component("ppapi_cpp_lib") {
+    sources = gypi_values.cpp_source_files + [
+                "cpp/module_embedder.h",
+                "cpp/ppp_entrypoints.cc",
+              ]
+  }
+
+  component("ppapi_gles2_lib") {
+    sources = [
+      "lib/gl/gles2/gl2ext_ppapi.c",
+      "lib/gl/gles2/gl2ext_ppapi.h",
+      "lib/gl/gles2/gles2.c",
+    ]
+
+    include_dirs = [ "lib/gl/include" ]
+  }
+}
+
 component("ppapi_shared") {
   sources = [
     "shared_impl/array_var.cc",
     "shared_impl/array_var.h",
     "shared_impl/array_writer.cc",
     "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",
@@ skipping 212 matching lines @@
     "thunk/ppb_url_loader_api.h",
     "thunk/ppb_url_loader_thunk.cc",
     "thunk/ppb_url_loader_trusted_thunk.cc",
     "thunk/ppb_url_request_info_api.h",
     "thunk/ppb_url_request_info_thunk.cc",
     "thunk/ppb_url_response_info_api.h",
     "thunk/ppb_url_response_info_thunk.cc",
     "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_encoder_api.h",
     "thunk/ppb_video_encoder_thunk.cc",
     "thunk/ppb_video_frame_api.h",
     "thunk/ppb_video_frame_thunk.cc",
     "thunk/ppb_video_source_private_api.h",
@@ skipping 36 matching lines @@
       "thunk/ppb_flash_fullscreen_thunk.cc",
       "thunk/ppb_flash_menu_thunk.cc",
       "thunk/ppb_flash_thunk.cc",
       "thunk/ppb_flash_message_loop_thunk.cc",
       "thunk/ppb_gles_chromium_texture_mapping_thunk.cc",
       "thunk/ppb_pdf_thunk.cc",
       "thunk/ppb_platform_verification_private_thunk.cc",
       "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",
     ]
   }
 
   # We exclude a few more things for nacl_win64, to avoid pulling in more
   # dependencies.
   if (is_win && cpu_arch == "x64" && current_toolchain != default_toolchain) {
     sources -= [
       "shared_impl/ppb_audio_shared.cc",
       "shared_impl/ppb_graphics_3d_shared.cc",
@@ skipping 28 matching lines @@
     "//gpu/command_buffer/common",
     "//ipc",
     "//media:shared_memory_support",
     "//skia",
     "//third_party/icu:icuuc",
     "//ui/events:events_base",
     "//ui/surface",
     "//url",
   ]
 
+  if (is_nacl) {
+    deps -= [
+      "//base/third_party/dynamic_annotations",
+      "//skia",
+      "//ui/events:events_base",
+      "//ui/surface",
+    ]
+
+    public_deps -= [ blink_target ]
+  }
+
   if (is_mac) {
     libs = [ "QuartzCore.framework" ]
   } else if (is_win) {
     cflags = [ "/wd4267" ]  # size_t to int truncation.
   }
 }
 
 source_set("ppapi_ipc") {
   sources = [
     "proxy/nacl_message_scanner.cc",
@@ skipping 24 matching lines @@
     ":ppapi_shared",
     "//base",
     "//gpu/ipc",
     "//ipc",
     "//skia",
     "//ui/events/ipc",
   ]
 
   if (is_nacl) {
     sources -= [ "proxy/serialized_flash_menu.cc" ]
+
+    deps -= [
+      "//skia",
+      "//ui/events/ipc",
+    ]
   }
 }
 
 component("ppapi_proxy") {
   sources = [
     # Take some standalone files from the C++ wrapper allowing us to more
     # easily make async callbacks in the proxy. We can"t depend on the
     # full C++ wrappers at this layer since the C++ wrappers expect
     # symbols defining the globals for "being a plugin" which we are not.
     # These callback files are standalone.
@@ skipping 155 matching lines @@
     "proxy/udp_socket_resource_base.h",
     "proxy/uma_private_resource.cc",
     "proxy/uma_private_resource.h",
     "proxy/url_loader_resource.cc",
     "proxy/url_loader_resource.h",
     "proxy/url_request_info_resource.cc",
     "proxy/url_request_info_resource.h",
     "proxy/url_response_info_resource.cc",
     "proxy/url_response_info_resource.h",
     "proxy/var_serialization_rules.h",
+    "proxy/video_decoder_resource.cc",
+    "proxy/video_decoder_resource.h",
+    "proxy/video_encoder_resource.cc",
+    "proxy/video_encoder_resource.h",
     "proxy/video_destination_resource.cc",
     "proxy/video_destination_resource.h",
     "proxy/video_frame_resource.cc",
     "proxy/video_frame_resource.h",
     "proxy/video_source_resource.cc",
     "proxy/video_source_resource.h",
     "proxy/websocket_resource.cc",
     "proxy/websocket_resource.h",
   ]
 
@@ skipping 50 matching lines @@
       "proxy/ppb_flash_message_loop_proxy.cc",
       "proxy/ppb_flash_message_loop_proxy.h",
       "proxy/ppb_video_decoder_proxy.cc",
       "proxy/ppb_video_decoder_proxy.h",
       "proxy/ppp_content_decryptor_private_proxy.cc",
       "proxy/ppp_content_decryptor_private_proxy.h",
       "proxy/ppp_instance_private_proxy.cc",
       "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/video_encoder_resource.cc",
-      "proxy/video_encoder_resource.h",
       "proxy/talk_resource.cc",
       "proxy/talk_resource.h",
       "proxy/video_capture_resource.cc",
       "proxy/video_capture_resource.h",
     ]
   }
 
   defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
 
   deps = [
     ":ppapi_c",
     ":ppapi_shared",
     ":ppapi_ipc",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//gin",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/ipc",
     "//media:shared_memory_support",
     "//ipc",
     "//skia",
     "//third_party/icu",
     "//ui/events:events_base",
     "//ui/surface",
     blink_target,
   ]
 
+  if (is_nacl) {
+    deps -= [
+      "//base/third_party/dynamic_annotations",
+      "//gin",
+      "//skia",
+      "//ui/events:events_base",
+      "//ui/surface",
+      blink_target,
+    ]
+
+    deps += [ "//ui/events:latency_info" ]
+  }
+
   if (is_win) {
     cflags = [ "/wd4267" ]  # size_t to int truncation.
   }
 }
 
 component("ppapi_host") {
   sources = [
     "host/dispatch_host_message.h",
     "host/error_conversion.cc",
     "host/error_conversion.h",
@@ skipping 48 matching lines @@
     ":ppapi_proxy",
     ":ppapi_shared",
     "//base/test:test_support",
     "//ipc",
     "//ipc:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 # TODO(GYP) other targets from ppapi_tests.gyp