Split apart the PPAPI GN targets

This puts BUILD files in the corresponding directories without duplicate names.

Adds a template for ppapi examples and writes the build for one example. I only did one at this point to test the infrastructure without making this patch too large.

NOPRESUBMIT=true

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

Cr-Commit-Position: refs/heads/master@{#316352}

36 files changed, 977 insertions, 829 deletions

diff --git a/BUILD.gn b/BUILD.gn
index e47ef75..0aee266 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,7 +68,7 @@ group("root") {
     "//mojo",
     "//net",
     "//pdf",
-    "//ppapi:ppapi_c",
+    "//ppapi/examples",
     "//printing",
     "//remoting/client/plugin",
     "//sandbox",
@@ -220,7 +220,7 @@ group("root") {
       "//extensions/common/api",
       "//extensions/renderer",
       "//pdf",  # Not compiled on Android in GYP yet, either.
-      "//ppapi:ppapi_c",
+      "//ppapi/examples",
       "//third_party/libusb",
       "//ui/keyboard",  # Blocked on content.
 
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 828f6bc..2ef9bdde 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -252,7 +252,7 @@ group("browser_dependencies") {
     "//sync",
   ]
   if (!is_ios) {
-    deps += [ "//ppapi:ppapi_host" ]
+    deps += [ "//ppapi/host" ]
   }
 
   if (enable_basic_printing || enable_print_preview) {
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 2f21c8e..6619495 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -407,7 +407,7 @@ static_library("browser") {
         rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome")
     deps += [
       "//components/pdf/browser",
-      "//ppapi:ppapi_ipc",
+      "//ppapi/proxy:ipc",
       "//third_party/adobe/flash:flapper_version_h",
     ]
   }
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index ab7f562..8742198 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -80,7 +80,7 @@ source_set("chromeos") {
     "//device/hid",
     "//media",
     "//net",
-    "//ppapi:ppapi_ipc",  # For PpapiMsg_LoadPlugin
+    "//ppapi/proxy:ipc",  # For PpapiMsg_LoadPlugin
 
     # TODO: care about enable_basic_printing and enable_print_preview.
     "//printing",
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 893b413..47f8af4 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -175,7 +175,7 @@ static_library("ui") {
     sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources,
                            ".",
                            "//chrome")
-    deps += [ "//ppapi:ppapi_ipc" ]
+    deps += [ "//ppapi/proxy:ipc" ]
   }
   if (safe_browsing_mode == 1) {
     defines += [ "FULL_SAFE_BROWSING" ]
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index ede533a..4cb703b 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -77,10 +77,10 @@ static_library("renderer") {
         rebase_path(gypi_values.chrome_renderer_plugin_sources, ".", "..")
     deps += [
       "//components/pdf/renderer",
-      "//ppapi:ppapi_host",
-      "//ppapi:ppapi_ipc",
-      "//ppapi:ppapi_proxy",
-      "//ppapi:ppapi_shared",
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/proxy:ipc",
+      "//ppapi/shared_impl",
     ]
   }
 
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ee3b1ea..45faaaf 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -142,7 +142,7 @@ source_set("test_support") {
       "//google_apis:test_support",
       "//ipc:test_support",
       "//media:test_support",
-      "//ppapi:ppapi_shared",
+      "//ppapi/shared_impl",
       "//sql:test_support",
       "//third_party/leveldatabase",
       "//ui/base",
@@ -1159,7 +1159,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
     #if (enable_pepper_cdms) {
     #  deps += [
     #    "//media/cdm/ppapi:clearkeycdmadapter",
-    #    "//ppapi:ppapi_cpp",
+    #    "//ppapi/cpp",
     #    "//third_party/widevine/cdm:adapter",
     #  ]
     #}
diff --git a/components/pdf/renderer/BUILD.gn b/components/pdf/renderer/BUILD.gn
index 5d2b326..e834a3c 100644
--- a/components/pdf/renderer/BUILD.gn
+++ b/components/pdf/renderer/BUILD.gn
@@ -21,7 +21,7 @@ static_library("renderer") {
     "//components/strings",
     "//content/public/renderer",
     "//gin",
-    "//ppapi:ppapi_shared",
+    "//ppapi/shared_impl",
     "//third_party/icu",
     "//v8",
     "//third_party/WebKit/public:blink_minimal",
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 5196fa9..4543c90 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -248,8 +248,8 @@ source_set("browser") {
                            ".",
                            "//content")
     deps += [
-      "//ppapi:ppapi_ipc",
-      "//ppapi:ppapi_shared",
+      "//ppapi/proxy:ipc",
+      "//ppapi/shared_impl",
     ]
     if (!use_ozone || use_pango) {
       sources -= [ "renderer_host/pepper/pepper_truetype_font_list_ozone.cc" ]
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 9a1f71f..935db3f 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -48,7 +48,7 @@ source_set("child") {
   }
 
   if (enable_plugins) {
-    deps += [ "//ppapi:ppapi_proxy" ]
+    deps += [ "//ppapi/proxy" ]
   } else {
     sources -= [
       "browser_font_resource_trusted.cc",
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index d6cf042..6bf0f64 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -288,7 +288,7 @@ source_set("common") {
   }
 
   if (enable_plugins) {
-    deps += [ "//ppapi:ppapi_shared" ]
+    deps += [ "//ppapi/shared_impl" ]
   } else {
     sources -= [
       "pepper_file_util.cc",
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index d6926ce..971a060 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -25,7 +25,7 @@ source_set("ppapi_plugin") {
     "//content:export",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
-    "//ppapi:ppapi_ipc",
+    "//ppapi/proxy:ipc",
     "//skia",
     "//third_party/icu",
     "//third_party/WebKit/public:blink",
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index f7259aa9..6e05909 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -143,9 +143,9 @@ source_set("renderer") {
             ".",
             "//content")
     deps += [
-      "//ppapi:ppapi_host",
-      "//ppapi:ppapi_proxy",
-      "//ppapi:ppapi_shared",
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/shared_impl",
       "//third_party/libyuv",
     ]
   } else {
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 1512477..7164da0 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -65,10 +65,11 @@ static_library("test_support") {
       "//cc:test_support",
       "//ipc/mojo",
       "//media",
-      "//ppapi:ppapi_host",
-      "//ppapi:ppapi_proxy",
-      "//ppapi:ppapi_shared",
-      "//ppapi:ppapi_unittest_shared",
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/proxy:test_support",
+      "//ppapi/shared_impl",
+      "//ppapi/shared_impl:test_support",
       "//storage/browser",
       "//storage/common",
       "//ui/surface",
@@ -281,10 +282,10 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {
       "//media:shared_memory_support",
       "//mojo/environment:chromium",
       "//net:test_support",
-      "//ppapi:ppapi_host",
-      "//ppapi:ppapi_ipc",
-      "//ppapi:ppapi_proxy",
-      "//ppapi:ppapi_shared",
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/proxy:ipc",
+      "//ppapi/shared_impl",
       "//third_party/mojo/src/mojo/edk/system",
       "//third_party/mojo/src/mojo/edk/test:test_support",
       "//third_party/mojo/src/mojo/public/cpp/bindings",
diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn
index 4879596..69369e2 100644
--- a/media/cdm/ppapi/BUILD.gn
+++ b/media/cdm/ppapi/BUILD.gn
@@ -57,6 +57,6 @@ group("clearkeycdmadapter") {
     ":clearkeycdm",
 
     #":clearkeycdmadapter_resources",  TODO(GYP)
-    "//ppapi:ppapi_cpp",
+    "//ppapi/cpp",
   ]
 }
diff --git a/pdf/BUILD.gn b/pdf/BUILD.gn
index 4ecd961..49f49a4 100644
--- a/pdf/BUILD.gn
+++ b/pdf/BUILD.gn
@@ -72,7 +72,7 @@ static_library("pdf") {
     "//components/ui/zoom:ui_zoom",
     "//content/public/common",
     "//net",
-    "//ppapi:ppapi_internal_module",
+    "//ppapi/cpp/private:internal_module",
     "//third_party/pdfium",
   ]
 }
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index 24827ab..c638637 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -2,798 +2,18 @@
 # 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
-#if (chrome_multiple_dll) {
-#  blink_target = "//third_party/WebKit/public:blink_minimal"
-#} else {
-blink_target = "//third_party/WebKit/public:blink"
-#}
-
-# These are just headers.
-source_set("ppapi_c") {
-  sources = gypi_values.c_source_files
-}
-
-# Some targets need to depend on the PPAPI version only. This target exists so
-# they can include this header without header check warnings.
-source_set("ppapi_macros") {
-  sources = [
-    "c/pp_macros.h",
-  ]
-}
-
-source_set("ppapi_cpp_objects") {
-  sources = gypi_values.cpp_source_files
-}
-
-source_set("ppapi_cpp") {
-  sources = [
-    "cpp/module_embedder.h",
-    "cpp/ppp_entrypoints.cc",
-  ]
-
-  deps = [
-    ":ppapi_c",
-    ":ppapi_cpp_objects",
-  ]
-}
-
-source_set("ppapi_internal_module") {
-  sources = [
-    "cpp/private/internal_module.cc",
-    "cpp/private/internal_module.h",
-  ]
-}
-
-source_set("ppapi_gles2") {
-  sources = [
-    "lib/gl/gles2/gl2ext_ppapi.c",
-    "lib/gl/gles2/gl2ext_ppapi.h",
-    "lib/gl/gles2/gles2.c",
-  ]
-
-  include_dirs = [ "lib/gl/include" ]
-
-  deps = [
-    ":ppapi_c",
-  ]
-}
-
+import("//ppapi/ppapi_sources.gni")
 # TODO(brettw) argument list is too long. Need to add response files.
 #shared_library("ppapi_tests") {
-#  sources = gypi_values.test_common_source_files +
-#            gypi_values.test_trusted_source_files
+#  sources = ppapi_sources.test_common_source_files +
+#            ppapi_sources.test_trusted_source_files
 #
 #  defines = [ "GL_GLEXT_PROTOTYPES" ]
 #  include_dirs = [ "lib/gl/include" ]
 #
 #  deps = [
-#    ":ppapi_cpp",
-#    ":ppapi_shared",
+#    "//ppapi/cpp",
+#    "//ppapi/shared_impl",
 #  ]
 #}
-
-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",
-    "shared_impl/dictionary_var.cc",
-    "shared_impl/dictionary_var.h",
-    "shared_impl/file_io_state_manager.cc",
-    "shared_impl/file_io_state_manager.h",
-    "shared_impl/file_growth.cc",
-    "shared_impl/file_growth.h",
-    "shared_impl/file_path.cc",
-    "shared_impl/file_path.h",
-    "shared_impl/file_ref_create_info.cc",
-    "shared_impl/file_ref_create_info.h",
-    "shared_impl/file_ref_util.cc",
-    "shared_impl/file_ref_util.h",
-    "shared_impl/file_system_util.cc",
-    "shared_impl/file_system_util.h",
-    "shared_impl/file_type_conversion.cc",
-    "shared_impl/file_type_conversion.h",
-    "shared_impl/host_resource.cc",
-    "shared_impl/host_resource.h",
-    "shared_impl/id_assignment.cc",
-    "shared_impl/id_assignment.h",
-    "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",
-    "shared_impl/platform_file.h",
-    "shared_impl/ppapi_constants.h",
-    "shared_impl/ppapi_globals.cc",
-    "shared_impl/ppapi_globals.h",
-    "shared_impl/ppapi_nacl_plugin_args.cc",
-    "shared_impl/ppapi_nacl_plugin_args.h",
-    "shared_impl/ppapi_permissions.cc",
-    "shared_impl/ppapi_permissions.h",
-    "shared_impl/ppapi_preferences.cc",
-    "shared_impl/ppapi_preferences.h",
-    "shared_impl/ppapi_switches.cc",
-    "shared_impl/ppapi_switches.h",
-    "shared_impl/ppb_audio_config_shared.cc",
-    "shared_impl/ppb_audio_config_shared.h",
-    "shared_impl/ppb_audio_shared.cc",
-    "shared_impl/ppb_audio_shared.h",
-    "shared_impl/ppb_crypto_shared.cc",
-    "shared_impl/ppb_device_ref_shared.cc",
-    "shared_impl/ppb_device_ref_shared.h",
-    "shared_impl/ppb_gamepad_shared.cc",
-    "shared_impl/ppb_gamepad_shared.h",
-    "shared_impl/ppb_graphics_3d_shared.cc",
-    "shared_impl/ppb_graphics_3d_shared.h",
-    "shared_impl/ppb_image_data_shared.cc",
-    "shared_impl/ppb_image_data_shared.h",
-    "shared_impl/ppb_input_event_shared.cc",
-    "shared_impl/ppb_input_event_shared.h",
-    "shared_impl/ppb_instance_shared.cc",
-    "shared_impl/ppb_instance_shared.h",
-    "shared_impl/ppb_memory_shared.cc",
-    "shared_impl/ppb_message_loop_shared.cc",
-    "shared_impl/ppb_message_loop_shared.h",
-    "shared_impl/ppb_opengles2_shared.cc",
-    "shared_impl/ppb_opengles2_shared.h",
-    "shared_impl/ppb_tcp_socket_shared.cc",
-    "shared_impl/ppb_tcp_socket_shared.h",
-    "shared_impl/ppb_trace_event_impl.cc",
-    "shared_impl/ppb_trace_event_impl.h",
-    "shared_impl/ppb_var_shared.cc",
-    "shared_impl/ppb_var_shared.h",
-    "shared_impl/ppb_view_shared.cc",
-    "shared_impl/ppb_view_shared.h",
-    "shared_impl/ppp_flash_browser_operations_shared.h",
-    "shared_impl/ppp_instance_combined.cc",
-    "shared_impl/ppp_instance_combined.h",
-    "shared_impl/proxy_lock.cc",
-    "shared_impl/proxy_lock.h",
-    "shared_impl/resource.cc",
-    "shared_impl/resource.h",
-    "shared_impl/resource_tracker.cc",
-    "shared_impl/resource_tracker.h",
-    "shared_impl/resource_var.cc",
-    "shared_impl/resource_var.h",
-    "shared_impl/scoped_pp_resource.cc",
-    "shared_impl/scoped_pp_resource.h",
-    "shared_impl/scoped_pp_var.cc",
-    "shared_impl/scoped_pp_var.h",
-    "shared_impl/socket_option_data.cc",
-    "shared_impl/socket_option_data.h",
-    "shared_impl/test_harness_utils.cc",
-    "shared_impl/test_harness_utils.h",
-    "shared_impl/thread_aware_callback.cc",
-    "shared_impl/thread_aware_callback.h",
-    "shared_impl/time_conversion.cc",
-    "shared_impl/time_conversion.h",
-    "shared_impl/tracked_callback.cc",
-    "shared_impl/tracked_callback.h",
-    "shared_impl/url_request_info_data.cc",
-    "shared_impl/url_request_info_data.h",
-    "shared_impl/url_response_info_data.cc",
-    "shared_impl/url_response_info_data.h",
-    "shared_impl/var.cc",
-    "shared_impl/var.h",
-    "shared_impl/var_tracker.cc",
-    "shared_impl/var_tracker.h",
-
-    # TODO(viettrungluu): Split these out; it won"t be used in NaCl.
-    "shared_impl/private/net_address_private_impl.cc",
-    "shared_impl/private/net_address_private_impl_constants.cc",
-    "shared_impl/private/net_address_private_impl.h",
-    "shared_impl/private/ppb_x509_certificate_private_shared.cc",
-    "shared_impl/private/ppb_x509_certificate_private_shared.h",
-    "thunk/enter.cc",
-    "thunk/enter.h",
-    "thunk/ppb_audio_api.h",
-    "thunk/ppb_audio_config_api.h",
-    "thunk/ppb_audio_config_thunk.cc",
-    "thunk/ppb_audio_buffer_api.h",
-    "thunk/ppb_audio_buffer_thunk.cc",
-    "thunk/ppb_audio_input_api.h",
-    "thunk/ppb_audio_thunk.cc",
-    "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",
-    "thunk/ppb_device_ref_dev_thunk.cc",
-    "thunk/ppb_ext_crx_file_system_private_thunk.cc",
-    "thunk/ppb_file_chooser_api.h",
-    "thunk/ppb_file_chooser_dev_thunk.cc",
-    "thunk/ppb_file_chooser_trusted_thunk.cc",
-    "thunk/ppb_file_io_api.h",
-    "thunk/ppb_file_io_private_thunk.cc",
-    "thunk/ppb_file_io_thunk.cc",
-    "thunk/ppb_file_mapping_thunk.cc",
-    "thunk/ppb_file_ref_api.h",
-    "thunk/ppb_file_ref_thunk.cc",
-    "thunk/ppb_file_system_api.h",
-    "thunk/ppb_file_system_thunk.cc",
-    "thunk/ppb_find_private_thunk.cc",
-    "thunk/ppb_flash_clipboard_api.h",
-    "thunk/ppb_flash_drm_api.h",
-    "thunk/ppb_flash_font_file_api.h",
-    "thunk/ppb_flash_fullscreen_api.h",
-    "thunk/ppb_flash_functions_api.h",
-    "thunk/ppb_flash_menu_api.h",
-    "thunk/ppb_flash_message_loop_api.h",
-    "thunk/ppb_flash_print_thunk.cc",
-    "thunk/ppb_fullscreen_thunk.cc",
-    "thunk/ppb_gamepad_api.h",
-    "thunk/ppb_gamepad_thunk.cc",
-    "thunk/ppb_graphics_2d_api.h",
-    "thunk/ppb_graphics_2d_thunk.cc",
-    "thunk/ppb_graphics_3d_api.h",
-    "thunk/ppb_graphics_3d_thunk.cc",
-    "thunk/ppb_host_resolver_api.h",
-    "thunk/ppb_host_resolver_thunk.cc",
-    "thunk/ppb_host_resolver_private_api.h",
-    "thunk/ppb_host_resolver_private_thunk.cc",
-    "thunk/ppb_image_data_api.h",
-    "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",
-    "thunk/ppb_isolated_file_system_private_api.h",
-    "thunk/ppb_isolated_file_system_private_thunk.cc",
-    "thunk/ppb_media_stream_audio_track_api.h",
-    "thunk/ppb_media_stream_audio_track_thunk.cc",
-    "thunk/ppb_media_stream_video_track_api.h",
-    "thunk/ppb_media_stream_video_track_thunk.cc",
-    "thunk/ppb_message_loop_api.h",
-    "thunk/ppb_messaging_thunk.cc",
-    "thunk/ppb_mouse_cursor_thunk.cc",
-    "thunk/ppb_mouse_lock_thunk.cc",
-    "thunk/ppb_net_address_api.h",
-    "thunk/ppb_net_address_thunk.cc",
-    "thunk/ppb_network_list_api.h",
-    "thunk/ppb_network_list_thunk.cc",
-    "thunk/ppb_network_monitor_api.h",
-    "thunk/ppb_network_monitor_thunk.cc",
-    "thunk/ppb_network_proxy_api.h",
-    "thunk/ppb_network_proxy_thunk.cc",
-    "thunk/ppb_output_protection_api.h",
-    "thunk/ppb_output_protection_private_thunk.cc",
-    "thunk/ppb_pdf_api.h",
-    "thunk/ppb_platform_verification_api.h",
-    "thunk/ppb_printing_api.h",
-    "thunk/ppb_printing_dev_thunk.cc",
-    "thunk/ppb_scrollbar_api.h",
-    "thunk/ppb_talk_private_api.h",
-    "thunk/ppb_tcp_server_socket_private_api.h",
-    "thunk/ppb_tcp_server_socket_private_thunk.cc",
-    "thunk/ppb_tcp_socket_api.h",
-    "thunk/ppb_tcp_socket_private_api.h",
-    "thunk/ppb_tcp_socket_private_thunk.cc",
-    "thunk/ppb_tcp_socket_thunk.cc",
-    "thunk/ppb_text_input_thunk.cc",
-    "thunk/ppb_truetype_font_api.h",
-    "thunk/ppb_truetype_font_singleton_api.h",
-    "thunk/ppb_truetype_font_dev_thunk.cc",
-    "thunk/ppb_udp_socket_api.h",
-    "thunk/ppb_udp_socket_thunk.cc",
-    "thunk/ppb_udp_socket_private_api.h",
-    "thunk/ppb_udp_socket_private_thunk.cc",
-    "thunk/ppb_uma_private_thunk.cc",
-    "thunk/ppb_uma_singleton_api.h",
-    "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",
-    "thunk/ppb_video_source_private_thunk.cc",
-    "thunk/ppb_view_api.h",
-    "thunk/ppb_view_dev_thunk.cc",
-    "thunk/ppb_view_thunk.cc",
-    "thunk/ppb_websocket_api.h",
-    "thunk/ppb_websocket_thunk.cc",
-    "thunk/ppb_widget_api.h",
-    "thunk/ppb_widget_dev_thunk.cc",
-    "thunk/ppb_x509_certificate_private_api.h",
-    "thunk/ppb_x509_certificate_private_thunk.cc",
-    "thunk/ppb_zoom_dev_thunk.cc",
-    "thunk/thunk.h",
-  ]
-
-  if (!is_nacl) {
-    sources += [
-      "shared_impl/flash_clipboard_format_registry.cc",
-      "shared_impl/flash_clipboard_format_registry.h",
-      "shared_impl/ppb_url_util_shared.cc",
-      "shared_impl/ppb_url_util_shared.h",
-      "shared_impl/ppb_video_decoder_shared.cc",
-      "shared_impl/ppb_video_decoder_shared.h",
-      "shared_impl/private/ppb_char_set_shared.cc",
-      "shared_impl/private/ppb_char_set_shared.h",
-      "thunk/ppb_audio_input_dev_thunk.cc",
-      "thunk/ppb_broker_thunk.cc",
-      "thunk/ppb_browser_font_trusted_thunk.cc",
-      "thunk/ppb_buffer_thunk.cc",
-      "thunk/ppb_content_decryptor_private_thunk.cc",
-      "thunk/ppb_char_set_thunk.cc",
-      "thunk/ppb_flash_clipboard_thunk.cc",
-      "thunk/ppb_flash_device_id_thunk.cc",
-      "thunk/ppb_flash_drm_thunk.cc",
-      "thunk/ppb_flash_file_fileref_thunk.cc",
-      "thunk/ppb_flash_file_modulelocal_thunk.cc",
-      "thunk/ppb_flash_font_file_thunk.cc",
-      "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_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",
-      "shared_impl/ppb_opengles2_shared.cc",
-      "shared_impl/private/ppb_host_resolver_shared.cc",
-      "shared_impl/private/net_address_private_impl.cc",
-      "thunk/ppb_graphics_3d_thunk.cc",
-      "thunk/ppb_host_resolver_private_thunk.cc",
-      "thunk/ppb_tcp_server_socket_private_thunk.cc",
-      "thunk/ppb_tcp_socket_private_thunk.cc",
-      "thunk/ppb_udp_socket_private_thunk.cc",
-      "thunk/ppb_x509_certificate_private_thunk.cc",
-    ]
-  }
-
-  defines = [
-    "PPAPI_SHARED_IMPLEMENTATION",
-    "PPAPI_THUNK_IMPLEMENTATION",
-  ]
-
-  public_deps = [
-    blink_target,
-  ]
-  deps = [
-    ":ppapi_c",
-    "//base",
-    "//base:i18n",
-    "//base/third_party/dynamic_annotations",
-    "//gpu/command_buffer/client",
-    "//gpu/command_buffer/client:gles2_cmd_helper",
-    "//gpu/command_buffer/client:gles2_implementation",
-    "//gpu/command_buffer/common",
-    "//ipc",
-    "//media:shared_memory_support",
-    "//skia",
-    "//third_party/icu:icuuc",
-    "//ui/events:events_base",
-    "//ui/surface",
-    "//url",
-  ]
-
-  if (is_mac) {
-    libs = [ "QuartzCore.framework" ]
-  }
-}
-
-source_set("ppapi_ipc") {
-  sources = [
-    "proxy/nacl_message_scanner.cc",
-    "proxy/nacl_message_scanner.h",
-    "proxy/ppapi_messages.cc",
-    "proxy/ppapi_messages.h",
-    "proxy/ppapi_param_traits.cc",
-    "proxy/ppapi_param_traits.h",
-    "proxy/raw_var_data.cc",
-    "proxy/raw_var_data.h",
-    "proxy/resource_message_params.cc",
-    "proxy/resource_message_params.h",
-    "proxy/serialized_flash_menu.cc",
-    "proxy/serialized_flash_menu.h",
-    "proxy/serialized_handle.cc",
-    "proxy/serialized_handle.h",
-    "proxy/serialized_structs.cc",
-    "proxy/serialized_structs.h",
-    "proxy/serialized_var.cc",
-    "proxy/serialized_var.h",
-    "proxy/var_serialization_rules.h",
-  ]
-
-  defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
-
-  deps = [
-    ":ppapi_c",
-    ":ppapi_shared",
-    "//base",
-    "//gpu/ipc",
-    "//ipc",
-    "//skia",
-    "//ui/events/ipc",
-  ]
-
-  if (is_nacl) {
-    sources -= [ "proxy/serialized_flash_menu.cc" ]
-  }
-}
-
-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.
-    "cpp/completion_callback.h",
-    "utility/completion_callback_factory.h",
-    "proxy/audio_buffer_resource.cc",
-    "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",
-    "proxy/enter_proxy.h",
-    "proxy/error_conversion.cc",
-    "proxy/error_conversion.h",
-    "proxy/file_chooser_resource.cc",
-    "proxy/file_chooser_resource.h",
-    "proxy/file_io_resource.cc",
-    "proxy/file_io_resource.h",
-    "proxy/file_mapping_resource.cc",
-    "proxy/file_mapping_resource.h",
-    "proxy/file_mapping_resource_posix.cc",
-    "proxy/file_mapping_resource_win.cc",
-    "proxy/file_ref_resource.cc",
-    "proxy/file_ref_resource.h",
-    "proxy/file_system_resource.cc",
-    "proxy/file_system_resource.h",
-    "proxy/gamepad_resource.cc",
-    "proxy/gamepad_resource.h",
-    "proxy/graphics_2d_resource.cc",
-    "proxy/graphics_2d_resource.h",
-    "proxy/host_resolver_private_resource.cc",
-    "proxy/host_resolver_private_resource.h",
-    "proxy/host_resolver_resource.cc",
-    "proxy/host_resolver_resource.h",
-    "proxy/host_resolver_resource_base.cc",
-    "proxy/host_resolver_resource_base.h",
-    "proxy/interface_list.cc",
-    "proxy/interface_list.h",
-    "proxy/interface_proxy.cc",
-    "proxy/interface_proxy.h",
-    "proxy/isolated_file_system_private_resource.cc",
-    "proxy/isolated_file_system_private_resource.h",
-    "proxy/locking_resource_releaser.h",
-    "proxy/media_stream_audio_track_resource.cc",
-    "proxy/media_stream_audio_track_resource.h",
-    "proxy/media_stream_track_resource_base.cc",
-    "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",
-    "proxy/network_list_resource.h",
-    "proxy/network_monitor_resource.cc",
-    "proxy/network_monitor_resource.h",
-    "proxy/network_proxy_resource.cc",
-    "proxy/network_proxy_resource.h",
-    "proxy/output_protection_resource.cc",
-    "proxy/output_protection_resource.h",
-    "proxy/plugin_array_buffer_var.cc",
-    "proxy/plugin_array_buffer_var.h",
-    "proxy/plugin_dispatcher.cc",
-    "proxy/plugin_dispatcher.h",
-    "proxy/plugin_globals.cc",
-    "proxy/plugin_globals.h",
-    "proxy/plugin_message_filter.cc",
-    "proxy/plugin_message_filter.h",
-    "proxy/plugin_resource.cc",
-    "proxy/plugin_resource.h",
-    "proxy/plugin_resource_tracker.cc",
-    "proxy/plugin_resource_tracker.h",
-    "proxy/plugin_resource_var.cc",
-    "proxy/plugin_resource_var.h",
-    "proxy/plugin_var_serialization_rules.cc",
-    "proxy/plugin_var_serialization_rules.h",
-    "proxy/plugin_var_tracker.cc",
-    "proxy/plugin_var_tracker.h",
-    "proxy/ppapi_command_buffer_proxy.cc",
-    "proxy/ppapi_command_buffer_proxy.h",
-    "proxy/ppapi_messages.h",
-    "proxy/ppapi_message_utils.h",
-    "proxy/ppb_audio_proxy.cc",
-    "proxy/ppb_audio_proxy.h",
-    "proxy/ppb_core_proxy.cc",
-    "proxy/ppb_core_proxy.h",
-    "proxy/ppb_graphics_3d_proxy.cc",
-    "proxy/ppb_graphics_3d_proxy.h",
-    "proxy/ppb_image_data_proxy.cc",
-    "proxy/ppb_image_data_proxy.h",
-    "proxy/ppb_instance_proxy.cc",
-    "proxy/ppb_instance_proxy.h",
-    "proxy/ppb_message_loop_proxy.cc",
-    "proxy/ppb_message_loop_proxy.h",
-    "proxy/ppb_testing_proxy.cc",
-    "proxy/ppb_testing_proxy.h",
-    "proxy/ppb_var_deprecated_proxy.cc",
-    "proxy/ppb_var_deprecated_proxy.h",
-    "proxy/ppb_x509_certificate_private_proxy.cc",
-    "proxy/ppb_x509_certificate_private_proxy.h",
-    "proxy/ppp_class_proxy.cc",
-    "proxy/ppp_class_proxy.h",
-    "proxy/ppp_find_proxy.cc",
-    "proxy/ppp_find_proxy.h",
-    "proxy/ppp_graphics_3d_proxy.cc",
-    "proxy/ppp_graphics_3d_proxy.h",
-    "proxy/ppp_input_event_proxy.cc",
-    "proxy/ppp_input_event_proxy.h",
-    "proxy/ppp_instance_proxy.cc",
-    "proxy/ppp_instance_proxy.h",
-    "proxy/ppp_messaging_proxy.cc",
-    "proxy/ppp_messaging_proxy.h",
-    "proxy/ppp_mouse_lock_proxy.cc",
-    "proxy/ppp_mouse_lock_proxy.h",
-    "proxy/ppp_pdf_proxy.cc",
-    "proxy/ppp_pdf_proxy.h",
-    "proxy/ppp_printing_proxy.cc",
-    "proxy/ppp_printing_proxy.h",
-    "proxy/ppp_text_input_proxy.cc",
-    "proxy/ppp_text_input_proxy.h",
-    "proxy/printing_resource.cc",
-    "proxy/printing_resource.h",
-    "proxy/proxy_array_output.cc",
-    "proxy/proxy_array_output.h",
-    "proxy/proxy_channel.cc",
-    "proxy/proxy_channel.h",
-    "proxy/proxy_completion_callback_factory.h",
-    "proxy/proxy_module.cc",
-    "proxy/proxy_module.h",
-    "proxy/proxy_object_var.cc",
-    "proxy/proxy_object_var.h",
-    "proxy/resource_creation_proxy.cc",
-    "proxy/resource_creation_proxy.h",
-    "proxy/resource_reply_thread_registrar.cc",
-    "proxy/resource_reply_thread_registrar.h",
-    "proxy/tcp_server_socket_private_resource.cc",
-    "proxy/tcp_server_socket_private_resource.h",
-    "proxy/tcp_socket_private_resource.cc",
-    "proxy/tcp_socket_private_resource.h",
-    "proxy/tcp_socket_resource.cc",
-    "proxy/tcp_socket_resource.h",
-    "proxy/tcp_socket_resource_base.cc",
-    "proxy/tcp_socket_resource_base.h",
-    "proxy/truetype_font_resource.cc",
-    "proxy/truetype_font_resource.h",
-    "proxy/truetype_font_singleton_resource.cc",
-    "proxy/truetype_font_singleton_resource.h",
-    "proxy/udp_socket_private_resource.cc",
-    "proxy/udp_socket_private_resource.h",
-    "proxy/udp_socket_resource.cc",
-    "proxy/udp_socket_resource.h",
-    "proxy/udp_socket_resource_base.cc",
-    "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_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",
-  ]
-
-  if (is_nacl) {
-    sources += [
-      "nacl_irt/irt_ppapi.cc",
-      "nacl_irt/irt_ppapi.h",
-      "nacl_irt/irt_start.cc",
-      "nacl_irt/manifest_service.cc",
-      "nacl_irt/manifest_service.h",
-      "nacl_irt/plugin_main.cc",
-      "nacl_irt/plugin_main.h",
-      "nacl_irt/plugin_startup.cc",
-      "nacl_irt/plugin_startup.h",
-      "nacl_irt/ppapi_dispatcher.cc",
-      "nacl_irt/ppapi_dispatcher.h",
-    ]
-  } else {
-    sources += [
-      "proxy/audio_input_resource.cc",
-      "proxy/audio_input_resource.h",
-      "proxy/broker_dispatcher.cc",
-      "proxy/broker_dispatcher.h",
-      "proxy/browser_font_singleton_resource.cc",
-      "proxy/browser_font_singleton_resource.h",
-      "proxy/device_enumeration_resource_helper.cc",
-      "proxy/device_enumeration_resource_helper.h",
-      "proxy/flash_clipboard_resource.cc",
-      "proxy/flash_clipboard_resource.h",
-      "proxy/flash_drm_resource.cc",
-      "proxy/flash_drm_resource.h",
-      "proxy/flash_file_resource.cc",
-      "proxy/flash_file_resource.h",
-      "proxy/flash_font_file_resource.cc",
-      "proxy/flash_font_file_resource.h",
-      "proxy/flash_fullscreen_resource.cc",
-      "proxy/flash_fullscreen_resource.h",
-      "proxy/flash_menu_resource.cc",
-      "proxy/flash_menu_resource.h",
-      "proxy/flash_resource.cc",
-      "proxy/flash_resource.h",
-      "proxy/host_dispatcher.cc",
-      "proxy/host_dispatcher.h",
-      "proxy/host_var_serialization_rules.cc",
-      "proxy/host_var_serialization_rules.h",
-      "proxy/pdf_resource.cc",
-      "proxy/pdf_resource.h",
-      "proxy/platform_verification_private_resource.cc",
-      "proxy/platform_verification_private_resource.h",
-      "proxy/ppb_broker_proxy.cc",
-      "proxy/ppb_broker_proxy.h",
-      "proxy/ppb_buffer_proxy.cc",
-      "proxy/ppb_buffer_proxy.h",
-      "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,
-  ]
-}
-
-component("ppapi_host") {
-  sources = [
-    "host/dispatch_host_message.h",
-    "host/error_conversion.cc",
-    "host/error_conversion.h",
-    "host/host_factory.h",
-    "host/host_message_context.cc",
-    "host/host_message_context.h",
-    "host/instance_message_filter.cc",
-    "host/instance_message_filter.h",
-    "host/message_filter_host.cc",
-    "host/message_filter_host.h",
-    "host/ppapi_host.cc",
-    "host/ppapi_host.h",
-    "host/ppapi_host_export.h",
-    "host/resource_host.cc",
-    "host/resource_host.h",
-    "host/resource_message_filter.cc",
-    "host/resource_message_filter.h",
-    "host/resource_message_handler.cc",
-    "host/resource_message_handler.h",
-  ]
-
-  defines = [ "PPAPI_HOST_IMPLEMENTATION" ]
-
-  deps = [
-    ":ppapi_c",
-    ":ppapi_ipc",
-    ":ppapi_proxy",
-    ":ppapi_shared",
-    "//base",
-    "//ipc",
-    "//media:shared_memory_support",
-    "//ui/events:events_base",
-    "//ui/surface",
-    "//url",
-  ]
-}
-
-static_library("ppapi_unittest_shared") {
-  testonly = true
-  sources = [
-    "proxy/ppapi_proxy_test.cc",
-    "proxy/ppapi_proxy_test.h",
-    "proxy/resource_message_test_sink.cc",
-    "proxy/resource_message_test_sink.h",
-    "shared_impl/test_globals.cc",
-    "shared_impl/test_globals.h",
-    "shared_impl/unittest_utils.cc",
-    "shared_impl/unittest_utils.h",
-  ]
-
-  deps = [
-    ":ppapi_proxy",
-    ":ppapi_shared",
-    "//base/test:test_support",
-    "//ipc",
-    "//ipc:test_support",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
-}
 # TODO(GYP) other targets from ppapi_tests.gyp
diff --git a/ppapi/c/BUILD.gn b/ppapi/c/BUILD.gn
new file mode 100644
index 0000000..7ec7674
--- /dev/null
+++ b/ppapi/c/BUILD.gn
@@ -0,0 +1,10 @@
+# Copyright 2015 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.
+
+import("//ppapi/ppapi_sources.gni")
+
+# These are just headers.
+source_set("c") {
+  sources = rebase_path(ppapi_sources.c_source_files, ".", "..")
+}
diff --git a/ppapi/cpp/BUILD.gn b/ppapi/cpp/BUILD.gn
new file mode 100644
index 0000000..2e121be
--- /dev/null
+++ b/ppapi/cpp/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright 2015 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.
+
+import("//ppapi/ppapi_sources.gni")
+
+# Link to this target to get the PPAPI C++ wrapper objects and plugin startup
+# code. See also "objects" below.
+source_set("cpp") {
+  sources = [
+    "module_embedder.h",
+    "ppp_entrypoints.cc",
+  ]
+
+  deps = [
+    ":objects",
+    "//ppapi/c",
+  ]
+}
+
+# Link to this target to get only the PPAPI C++ wrapper objects but not the
+# plugin startup code. Some plugins need special startup code that they supply
+# themselves.
+source_set("objects") {
+  sources = rebase_path(ppapi_sources.cpp_source_files, ".", "..")
+}
diff --git a/ppapi/cpp/private/BUILD.gn b/ppapi/cpp/private/BUILD.gn
new file mode 100644
index 0000000..0aae3f1
--- /dev/null
+++ b/ppapi/cpp/private/BUILD.gn
@@ -0,0 +1,10 @@
+# Copyright 2015 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.
+
+source_set("internal_module") {
+  sources = [
+    "internal_module.cc",
+    "internal_module.h",
+  ]
+}
diff --git a/ppapi/examples/BUILD.gn b/ppapi/examples/BUILD.gn
new file mode 100644
index 0000000..db7b2e1
--- /dev/null
+++ b/ppapi/examples/BUILD.gn
@@ -0,0 +1,10 @@
+# Copyright 2015 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.
+
+group("examples") {
+  testonly = true
+  deps = [
+    "//ppapi/examples/audio",
+  ]
+}
diff --git a/ppapi/examples/audio/BUILD.gn b/ppapi/examples/audio/BUILD.gn
new file mode 100644
index 0000000..0b3deb8
--- /dev/null
+++ b/ppapi/examples/audio/BUILD.gn
@@ -0,0 +1,15 @@
+# Copyright 2015 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.
+
+import("//ppapi/examples/ppapi_example.gni")
+
+ppapi_example("audio") {
+  output_name = "ppapi_example_audio"
+  sources = [
+    "audio.cc",
+  ]
+  deps = [
+    "//ppapi/cpp",
+  ]
+}
diff --git a/ppapi/examples/ppapi_example.gni b/ppapi/examples/ppapi_example.gni
new file mode 100644
index 0000000..5345b1d
--- /dev/null
+++ b/ppapi/examples/ppapi_example.gni
@@ -0,0 +1,28 @@
+# Copyright 2015 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.
+
+# Declares a PPAPI example target of the correct type for the current platform
+# and with the right linker flags.
+template("ppapi_example") {
+  # TODO(GYP) on Mac this should be loadable_module.
+  shared_library(target_name) {
+    testonly = true
+    if (defined(invoker.output_name)) {
+      output_name = invoker.output_name
+    }
+    sources = invoker.sources
+    deps = invoker.deps
+
+    if (is_mac) {
+      # TODO(GYP) this should be a mac bundle
+      output_extension = "plugin"
+      ldflags = [
+        # Not to strip important symbols by -Wl,-dead_strip.
+        "-Wl,-exported_symbol,_PPP_GetInterface",
+        "-Wl,-exported_symbol,_PPP_InitializeModule",
+        "-Wl,-exported_symbol,_PPP_ShutdownModule",
+      ]
+    }
+  }
+}
diff --git a/ppapi/host/BUILD.gn b/ppapi/host/BUILD.gn
new file mode 100644
index 0000000..51bd0c5
--- /dev/null
+++ b/ppapi/host/BUILD.gn
@@ -0,0 +1,44 @@
+# Copyright 2015 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.
+
+component("host") {
+  output_name = "ppapi_host"
+
+  sources = [
+    "dispatch_host_message.h",
+    "error_conversion.cc",
+    "error_conversion.h",
+    "host_factory.h",
+    "host_message_context.cc",
+    "host_message_context.h",
+    "instance_message_filter.cc",
+    "instance_message_filter.h",
+    "message_filter_host.cc",
+    "message_filter_host.h",
+    "ppapi_host.cc",
+    "ppapi_host.h",
+    "ppapi_host_export.h",
+    "resource_host.cc",
+    "resource_host.h",
+    "resource_message_filter.cc",
+    "resource_message_filter.h",
+    "resource_message_handler.cc",
+    "resource_message_handler.h",
+  ]
+
+  defines = [ "PPAPI_HOST_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//ipc",
+    "//media:shared_memory_support",
+    "//ppapi/shared_impl",
+    "//ppapi/c",
+    "//ppapi/proxy:ipc",
+    "//ppapi/proxy",
+    "//ui/events:events_base",
+    "//ui/surface",
+    "//url",
+  ]
+}
diff --git a/ppapi/lib/gl/gles2/BUILD.gn b/ppapi/lib/gl/gles2/BUILD.gn
new file mode 100644
index 0000000..e9048a1
--- /dev/null
+++ b/ppapi/lib/gl/gles2/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2015 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.
+
+source_set("gles2") {
+  sources = [
+    "gl2ext_ppapi.c",
+    "gl2ext_ppapi.h",
+    "gles2.c",
+  ]
+
+  include_dirs = [ "lib/gl/include" ]
+
+  deps = [
+    "//ppapi/c",
+  ]
+}
diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi
index 04d0d41..0a07d53 100644
--- a/ppapi/ppapi_cpp.gypi
+++ b/ppapi/ppapi_cpp.gypi
@@ -11,7 +11,7 @@
   ],
   'targets': [
     {
-      # GN version: //ppapi:ppapi_c
+      # GN version: //ppapi/c
       'target_name': 'ppapi_c',
       'type': 'none',
       'all_dependent_settings': {
@@ -24,7 +24,7 @@
       ],
     },
     {
-      # GN version: //ppapi:ppapi_cpp_objects
+      # GN version: //ppapi/cpp:objects
       'target_name': 'ppapi_cpp_objects',
       'type': 'static_library',
       'dependencies': [
@@ -38,7 +38,7 @@
       ],
     },
     {
-      # GN version: //ppapi:ppapi_cpp
+      # GN version: //ppapi/cpp
       'target_name': 'ppapi_cpp',
       'type': 'static_library',
       'dependencies': [
@@ -54,7 +54,7 @@
       ],
     },
     {
-      # GN version: //ppapi:ppapi_internal_module
+      # GN version: //ppapi/cpp/private:internal_module
       'target_name': 'ppapi_internal_module',
       'type': 'static_library',
       'include_dirs+': [
diff --git a/ppapi/ppapi_gl.gypi b/ppapi/ppapi_gl.gypi
index 69673fe..47a0a4c 100644
--- a/ppapi/ppapi_gl.gypi
+++ b/ppapi/ppapi_gl.gypi
@@ -5,7 +5,7 @@
 {
   'targets': [
     {
-      # GN version: //ppapi:ppapi_gles2
+      # GN version: //ppapi/lib/gl/gles2
       'target_name': 'ppapi_gles2',
       'type': 'static_library',
       'dependencies': [
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index 4370640..6c526c0 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -33,7 +33,7 @@
   ],
   'targets': [
     {
-      # GN version: //ppapi:ppapi_shared
+      # GN version: //ppapi/shared_impl and //ppapi/thunk
       'target_name': 'ppapi_shared',
       'type': '<(component)',
       'variables': {
@@ -92,7 +92,7 @@
       # In a static build, build ppapi_ipc separately.
       'targets': [
         {
-          # GN version: //ppapi:ppapi_ipc
+          # GN version: //ppapi/proxy:ipc
           'target_name': 'ppapi_ipc',
           'type': 'static_library',
           'variables': {
@@ -114,7 +114,7 @@
           },
         },
         {
-          # GN version: //ppapi:ppapi_proxy
+          # GN version: //ppapi/proxy
           'target_name': 'ppapi_proxy',
           'type': 'static_library',
           'variables': {
diff --git a/ppapi/ppapi_sources.gni b/ppapi/ppapi_sources.gni
new file mode 100644
index 0000000..dcee45c
--- /dev/null
+++ b/ppapi/ppapi_sources.gni
@@ -0,0 +1,11 @@
+# Copyright 2015 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.
+
+# Import this file to get the ppapi_sources dictionary containing source files
+# from GYP. This is a .gni file so it can be shared between different BUILD.gn
+# files without having to re-run the script each time.
+ppapi_sources = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("ppapi_sources.gypi") ],
+                            "scope",
+                            [ "ppapi_sources.gypi" ])
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index 63c3370..c3013f8 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -79,7 +79,8 @@
 #      ],
     },
     {
-      # GN version: //ppapi:ppapi_unittest_shared
+      # GN version: //ppapi/proxy:test_support
+      #             //ppapi/shared_impl:test_support
       'target_name': 'ppapi_unittest_shared',
       'type': 'static_library',
       'dependencies': [
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
new file mode 100644
index 0000000..4e638cc
--- /dev/null
+++ b/ppapi/proxy/BUILD.gn
@@ -0,0 +1,350 @@
+# Copyright 2015 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.
+
+config("proxy_implementation") {
+  defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
+}
+
+component("proxy") {
+  output_name = "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.
+    "../cpp/completion_callback.h",
+    "../utility/completion_callback_factory.h",
+    "audio_buffer_resource.cc",
+    "audio_buffer_resource.h",
+    "broker_resource.cc",
+    "broker_resource.h",
+    "compositor_layer_resource.cc",
+    "compositor_layer_resource.h",
+    "compositor_resource.cc",
+    "compositor_resource.h",
+    "connection.h",
+    "dispatcher.cc",
+    "dispatcher.h",
+    "enter_proxy.h",
+    "error_conversion.cc",
+    "error_conversion.h",
+    "file_chooser_resource.cc",
+    "file_chooser_resource.h",
+    "file_io_resource.cc",
+    "file_io_resource.h",
+    "file_mapping_resource.cc",
+    "file_mapping_resource.h",
+    "file_mapping_resource_posix.cc",
+    "file_mapping_resource_win.cc",
+    "file_ref_resource.cc",
+    "file_ref_resource.h",
+    "file_system_resource.cc",
+    "file_system_resource.h",
+    "gamepad_resource.cc",
+    "gamepad_resource.h",
+    "graphics_2d_resource.cc",
+    "graphics_2d_resource.h",
+    "host_resolver_private_resource.cc",
+    "host_resolver_private_resource.h",
+    "host_resolver_resource.cc",
+    "host_resolver_resource.h",
+    "host_resolver_resource_base.cc",
+    "host_resolver_resource_base.h",
+    "interface_list.cc",
+    "interface_list.h",
+    "interface_proxy.cc",
+    "interface_proxy.h",
+    "isolated_file_system_private_resource.cc",
+    "isolated_file_system_private_resource.h",
+    "locking_resource_releaser.h",
+    "media_stream_audio_track_resource.cc",
+    "media_stream_audio_track_resource.h",
+    "media_stream_track_resource_base.cc",
+    "media_stream_track_resource_base.h",
+    "media_stream_video_track_resource.cc",
+    "media_stream_video_track_resource.h",
+    "message_handler.cc",
+    "message_handler.h",
+    "net_address_resource.cc",
+    "net_address_resource.h",
+    "network_list_resource.cc",
+    "network_list_resource.h",
+    "network_monitor_resource.cc",
+    "network_monitor_resource.h",
+    "network_proxy_resource.cc",
+    "network_proxy_resource.h",
+    "output_protection_resource.cc",
+    "output_protection_resource.h",
+    "plugin_array_buffer_var.cc",
+    "plugin_array_buffer_var.h",
+    "plugin_dispatcher.cc",
+    "plugin_dispatcher.h",
+    "plugin_globals.cc",
+    "plugin_globals.h",
+    "plugin_message_filter.cc",
+    "plugin_message_filter.h",
+    "plugin_resource.cc",
+    "plugin_resource.h",
+    "plugin_resource_tracker.cc",
+    "plugin_resource_tracker.h",
+    "plugin_resource_var.cc",
+    "plugin_resource_var.h",
+    "plugin_var_serialization_rules.cc",
+    "plugin_var_serialization_rules.h",
+    "plugin_var_tracker.cc",
+    "plugin_var_tracker.h",
+    "ppapi_command_buffer_proxy.cc",
+    "ppapi_command_buffer_proxy.h",
+    "ppapi_messages.h",
+    "ppapi_message_utils.h",
+    "ppb_audio_proxy.cc",
+    "ppb_audio_proxy.h",
+    "ppb_core_proxy.cc",
+    "ppb_core_proxy.h",
+    "ppb_graphics_3d_proxy.cc",
+    "ppb_graphics_3d_proxy.h",
+    "ppb_image_data_proxy.cc",
+    "ppb_image_data_proxy.h",
+    "ppb_instance_proxy.cc",
+    "ppb_instance_proxy.h",
+    "ppb_message_loop_proxy.cc",
+    "ppb_message_loop_proxy.h",
+    "ppb_testing_proxy.cc",
+    "ppb_testing_proxy.h",
+    "ppb_var_deprecated_proxy.cc",
+    "ppb_var_deprecated_proxy.h",
+    "ppb_x509_certificate_private_proxy.cc",
+    "ppb_x509_certificate_private_proxy.h",
+    "ppp_class_proxy.cc",
+    "ppp_class_proxy.h",
+    "ppp_find_proxy.cc",
+    "ppp_find_proxy.h",
+    "ppp_graphics_3d_proxy.cc",
+    "ppp_graphics_3d_proxy.h",
+    "ppp_input_event_proxy.cc",
+    "ppp_input_event_proxy.h",
+    "ppp_instance_proxy.cc",
+    "ppp_instance_proxy.h",
+    "ppp_messaging_proxy.cc",
+    "ppp_messaging_proxy.h",
+    "ppp_mouse_lock_proxy.cc",
+    "ppp_mouse_lock_proxy.h",
+    "ppp_pdf_proxy.cc",
+    "ppp_pdf_proxy.h",
+    "ppp_printing_proxy.cc",
+    "ppp_printing_proxy.h",
+    "ppp_text_input_proxy.cc",
+    "ppp_text_input_proxy.h",
+    "printing_resource.cc",
+    "printing_resource.h",
+    "proxy_array_output.cc",
+    "proxy_array_output.h",
+    "proxy_channel.cc",
+    "proxy_channel.h",
+    "proxy_completion_callback_factory.h",
+    "proxy_module.cc",
+    "proxy_module.h",
+    "proxy_object_var.cc",
+    "proxy_object_var.h",
+    "resource_creation_proxy.cc",
+    "resource_creation_proxy.h",
+    "resource_reply_thread_registrar.cc",
+    "resource_reply_thread_registrar.h",
+    "tcp_server_socket_private_resource.cc",
+    "tcp_server_socket_private_resource.h",
+    "tcp_socket_private_resource.cc",
+    "tcp_socket_private_resource.h",
+    "tcp_socket_resource.cc",
+    "tcp_socket_resource.h",
+    "tcp_socket_resource_base.cc",
+    "tcp_socket_resource_base.h",
+    "truetype_font_resource.cc",
+    "truetype_font_resource.h",
+    "truetype_font_singleton_resource.cc",
+    "truetype_font_singleton_resource.h",
+    "udp_socket_private_resource.cc",
+    "udp_socket_private_resource.h",
+    "udp_socket_resource.cc",
+    "udp_socket_resource.h",
+    "udp_socket_resource_base.cc",
+    "udp_socket_resource_base.h",
+    "uma_private_resource.cc",
+    "uma_private_resource.h",
+    "url_loader_resource.cc",
+    "url_loader_resource.h",
+    "url_request_info_resource.cc",
+    "url_request_info_resource.h",
+    "url_response_info_resource.cc",
+    "url_response_info_resource.h",
+    "var_serialization_rules.h",
+    "video_destination_resource.cc",
+    "video_destination_resource.h",
+    "video_frame_resource.cc",
+    "video_frame_resource.h",
+    "video_source_resource.cc",
+    "video_source_resource.h",
+    "websocket_resource.cc",
+    "websocket_resource.h",
+  ]
+
+  if (is_nacl) {
+    sources += [
+      "../nacl_irt/irt_ppapi.cc",
+      "../nacl_irt/irt_ppapi.h",
+      "../nacl_irt/irt_start.cc",
+      "../nacl_irt/manifest_service.cc",
+      "../nacl_irt/manifest_service.h",
+      "../nacl_irt/plugin_main.cc",
+      "../nacl_irt/plugin_main.h",
+      "../nacl_irt/plugin_startup.cc",
+      "../nacl_irt/plugin_startup.h",
+      "../nacl_irt/ppapi_dispatcher.cc",
+      "../nacl_irt/ppapi_dispatcher.h",
+    ]
+  } else {
+    sources += [
+      "audio_input_resource.cc",
+      "audio_input_resource.h",
+      "broker_dispatcher.cc",
+      "broker_dispatcher.h",
+      "browser_font_singleton_resource.cc",
+      "browser_font_singleton_resource.h",
+      "device_enumeration_resource_helper.cc",
+      "device_enumeration_resource_helper.h",
+      "flash_clipboard_resource.cc",
+      "flash_clipboard_resource.h",
+      "flash_drm_resource.cc",
+      "flash_drm_resource.h",
+      "flash_file_resource.cc",
+      "flash_file_resource.h",
+      "flash_font_file_resource.cc",
+      "flash_font_file_resource.h",
+      "flash_fullscreen_resource.cc",
+      "flash_fullscreen_resource.h",
+      "flash_menu_resource.cc",
+      "flash_menu_resource.h",
+      "flash_resource.cc",
+      "flash_resource.h",
+      "host_dispatcher.cc",
+      "host_dispatcher.h",
+      "host_var_serialization_rules.cc",
+      "host_var_serialization_rules.h",
+      "pdf_resource.cc",
+      "pdf_resource.h",
+      "platform_verification_private_resource.cc",
+      "platform_verification_private_resource.h",
+      "ppb_broker_proxy.cc",
+      "ppb_broker_proxy.h",
+      "ppb_buffer_proxy.cc",
+      "ppb_buffer_proxy.h",
+      "ppb_flash_message_loop_proxy.cc",
+      "ppb_flash_message_loop_proxy.h",
+      "ppb_video_decoder_proxy.cc",
+      "ppb_video_decoder_proxy.h",
+      "ppp_content_decryptor_private_proxy.cc",
+      "ppp_content_decryptor_private_proxy.h",
+      "ppp_instance_private_proxy.cc",
+      "ppp_instance_private_proxy.h",
+      "ppp_video_decoder_proxy.cc",
+      "ppp_video_decoder_proxy.h",
+      "video_decoder_resource.cc",
+      "video_decoder_resource.h",
+      "video_encoder_resource.cc",
+      "video_encoder_resource.h",
+      "talk_resource.cc",
+      "talk_resource.h",
+      "video_capture_resource.cc",
+      "video_capture_resource.h",
+    ]
+  }
+
+  configs += [ ":proxy_implementation" ]
+
+  deps = [
+    "//base",
+    "//base/third_party/dynamic_annotations",
+    "//gin",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//gpu/ipc",
+    "//ipc",
+    "//media:shared_memory_support",
+    "//ppapi/c",
+    "//ppapi/proxy:ipc",
+    "//ppapi/shared_impl",
+    "//skia",
+    "//third_party/icu",
+    "//ui/events:events_base",
+    "//ui/surface",
+  ]
+
+  # TODO(GYP) support chrome_multiple_dll
+  #if (chrome_multiple_dll) {
+  #  deps += [ "//third_party/WebKit/public:blink_minimal" ]
+  #} else {
+  deps += [ "//third_party/WebKit/public:blink" ]
+
+  #}
+}
+
+source_set("ipc") {
+  sources = [
+    "nacl_message_scanner.cc",
+    "nacl_message_scanner.h",
+    "ppapi_messages.cc",
+    "ppapi_messages.h",
+    "ppapi_param_traits.cc",
+    "ppapi_param_traits.h",
+    "raw_var_data.cc",
+    "raw_var_data.h",
+    "resource_message_params.cc",
+    "resource_message_params.h",
+    "serialized_flash_menu.cc",
+    "serialized_flash_menu.h",
+    "serialized_handle.cc",
+    "serialized_handle.h",
+    "serialized_structs.cc",
+    "serialized_structs.h",
+    "serialized_var.cc",
+    "serialized_var.h",
+    "var_serialization_rules.h",
+  ]
+  if (is_nacl) {
+    sources -= [ "serialized_flash_menu.cc" ]
+  }
+
+  configs += [ ":proxy_implementation" ]
+
+  deps = [
+    "//base",
+    "//gpu/ipc",
+    "//ipc",
+    "//ppapi/c",
+    "//ppapi/shared_impl",
+    "//skia",
+    "//ui/events/ipc",
+  ]
+}
+
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "ppapi_proxy_test.cc",
+    "ppapi_proxy_test.h",
+    "resource_message_test_sink.cc",
+    "resource_message_test_sink.h",
+  ]
+
+  deps = [
+    "//base/test:test_support",
+    "//ipc",
+    "//ipc:test_support",
+    "//ppapi/proxy",
+    "//ppapi/shared_impl",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn
new file mode 100644
index 0000000..b86553f
--- /dev/null
+++ b/ppapi/shared_impl/BUILD.gn
@@ -0,0 +1,215 @@
+# Copyright 2015 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.
+
+component("shared_impl") {
+  output_name = "ppapi_shared"
+
+  sources = [
+    "array_var.cc",
+    "array_var.h",
+    "array_writer.cc",
+    "array_writer.h",
+    "callback_tracker.cc",
+    "callback_tracker.h",
+    "compositor_layer_data.cc",
+    "compositor_layer_data.h",
+    "dictionary_var.cc",
+    "dictionary_var.h",
+    "file_io_state_manager.cc",
+    "file_io_state_manager.h",
+    "file_growth.cc",
+    "file_growth.h",
+    "file_path.cc",
+    "file_path.h",
+    "file_ref_create_info.cc",
+    "file_ref_create_info.h",
+    "file_ref_util.cc",
+    "file_ref_util.h",
+    "file_system_util.cc",
+    "file_system_util.h",
+    "file_type_conversion.cc",
+    "file_type_conversion.h",
+    "host_resource.cc",
+    "host_resource.h",
+    "id_assignment.cc",
+    "id_assignment.h",
+    "media_stream_buffer.h",
+    "media_stream_buffer_manager.cc",
+    "media_stream_buffer_manager.h",
+    "media_stream_audio_track_shared.cc",
+    "media_stream_audio_track_shared.h",
+    "media_stream_video_track_shared.h",
+    "media_stream_video_track_shared.cc",
+    "platform_file.cc",
+    "platform_file.h",
+    "ppapi_constants.h",
+    "ppapi_globals.cc",
+    "ppapi_globals.h",
+    "ppapi_nacl_plugin_args.cc",
+    "ppapi_nacl_plugin_args.h",
+    "ppapi_permissions.cc",
+    "ppapi_permissions.h",
+    "ppapi_preferences.cc",
+    "ppapi_preferences.h",
+    "ppapi_switches.cc",
+    "ppapi_switches.h",
+    "ppb_audio_config_shared.cc",
+    "ppb_audio_config_shared.h",
+    "ppb_audio_shared.cc",
+    "ppb_audio_shared.h",
+    "ppb_crypto_shared.cc",
+    "ppb_device_ref_shared.cc",
+    "ppb_device_ref_shared.h",
+    "ppb_gamepad_shared.cc",
+    "ppb_gamepad_shared.h",
+    "ppb_graphics_3d_shared.cc",
+    "ppb_graphics_3d_shared.h",
+    "ppb_image_data_shared.cc",
+    "ppb_image_data_shared.h",
+    "ppb_input_event_shared.cc",
+    "ppb_input_event_shared.h",
+    "ppb_instance_shared.cc",
+    "ppb_instance_shared.h",
+    "ppb_memory_shared.cc",
+    "ppb_message_loop_shared.cc",
+    "ppb_message_loop_shared.h",
+    "ppb_opengles2_shared.cc",
+    "ppb_opengles2_shared.h",
+    "ppb_tcp_socket_shared.cc",
+    "ppb_tcp_socket_shared.h",
+    "ppb_trace_event_impl.cc",
+    "ppb_trace_event_impl.h",
+    "ppb_var_shared.cc",
+    "ppb_var_shared.h",
+    "ppb_view_shared.cc",
+    "ppb_view_shared.h",
+    "ppp_flash_browser_operations_shared.h",
+    "ppp_instance_combined.cc",
+    "ppp_instance_combined.h",
+    "proxy_lock.cc",
+    "proxy_lock.h",
+    "resource.cc",
+    "resource.h",
+    "resource_tracker.cc",
+    "resource_tracker.h",
+    "resource_var.cc",
+    "resource_var.h",
+    "scoped_pp_resource.cc",
+    "scoped_pp_resource.h",
+    "scoped_pp_var.cc",
+    "scoped_pp_var.h",
+    "socket_option_data.cc",
+    "socket_option_data.h",
+    "test_harness_utils.cc",
+    "test_harness_utils.h",
+    "thread_aware_callback.cc",
+    "thread_aware_callback.h",
+    "time_conversion.cc",
+    "time_conversion.h",
+    "tracked_callback.cc",
+    "tracked_callback.h",
+    "url_request_info_data.cc",
+    "url_request_info_data.h",
+    "url_response_info_data.cc",
+    "url_response_info_data.h",
+    "var.cc",
+    "var.h",
+    "var_tracker.cc",
+    "var_tracker.h",
+
+    # TODO(viettrungluu): Split these out; it won"t be used in NaCl.
+    "private/net_address_private_impl.cc",
+    "private/net_address_private_impl_constants.cc",
+    "private/net_address_private_impl.h",
+    "private/ppb_x509_certificate_private_shared.cc",
+    "private/ppb_x509_certificate_private_shared.h",
+  ]
+
+  if (!is_nacl) {
+    sources += [
+      "flash_clipboard_format_registry.cc",
+      "flash_clipboard_format_registry.h",
+      "ppb_url_util_shared.cc",
+      "ppb_url_util_shared.h",
+      "ppb_video_decoder_shared.cc",
+      "ppb_video_decoder_shared.h",
+      "private/ppb_char_set_shared.cc",
+      "private/ppb_char_set_shared.h",
+    ]
+  }
+
+  # TODO(GYP) this isn't correct. This should only be specifically for the
+  # nacl_win64 build (cross-compiled for a 32-bit Chrome), rather than the
+  # native 64-bit Chrome build.
+  # See also //ppapi/thunk
+  if (is_win && cpu_arch == "x64" && current_toolchain != default_toolchain) {
+    sources -= [
+      "ppb_audio_shared.cc",
+      "ppb_graphics_3d_shared.cc",
+      "ppb_opengles2_shared.cc",
+      "private/ppb_host_resolver_shared.cc",
+      "private/net_address_private_impl.cc",
+    ]
+  }
+
+  defines = [
+    "PPAPI_SHARED_IMPLEMENTATION",
+
+    # This target also implements some thunk functions.
+    "PPAPI_THUNK_IMPLEMENTATION",
+  ]
+
+  # TODO(GYP) support chrome_multiple_dll
+  #if (chrome_multiple_dll) {
+  #  public_deps = [ "//third_party/WebKit/public:blink_minimal" ]
+  #} else {
+  public_deps = [
+    "//third_party/WebKit/public:blink",
+  ]
+
+  #}
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//gpu/command_buffer/client",
+    "//gpu/command_buffer/client:gles2_cmd_helper",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//gpu/command_buffer/common",
+    "//ipc",
+    "//media:shared_memory_support",
+    "//ppapi/c",
+    "//ppapi/thunk",
+    "//skia",
+    "//third_party/icu:icuuc",
+    "//ui/events:events_base",
+    "//ui/surface",
+    "//url",
+  ]
+
+  if (is_mac) {
+    libs = [ "QuartzCore.framework" ]
+  }
+}
+
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "test_globals.cc",
+    "test_globals.h",
+    "unittest_utils.cc",
+    "unittest_utils.h",
+  ]
+
+  deps = [
+    "//base/test:test_support",
+    "//ipc",
+    "//ipc:test_support",
+    "//ppapi/proxy",
+    "//ppapi/shared_impl",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
diff --git a/ppapi/thunk/BUILD.gn b/ppapi/thunk/BUILD.gn
new file mode 100644
index 0000000..e507816
--- /dev/null
+++ b/ppapi/thunk/BUILD.gn
@@ -0,0 +1,190 @@
+# Copyright 2015 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.
+
+source_set("thunk") {
+  sources = [
+    "enter.cc",
+    "enter.h",
+    "ppb_audio_api.h",
+    "ppb_audio_config_api.h",
+    "ppb_audio_config_thunk.cc",
+    "ppb_audio_buffer_api.h",
+    "ppb_audio_buffer_thunk.cc",
+    "ppb_audio_input_api.h",
+    "ppb_audio_thunk.cc",
+    "ppb_broker_api.h",
+    "ppb_browser_font_trusted_api.h",
+    "ppb_buffer_api.h",
+    "ppb_compositor_api.h",
+    "ppb_compositor_layer_api.h",
+    "ppb_compositor_layer_thunk.cc",
+    "ppb_compositor_thunk.cc",
+    "ppb_console_thunk.cc",
+    "ppb_cursor_control_thunk.cc",
+    "ppb_device_ref_api.h",
+    "ppb_device_ref_dev_thunk.cc",
+    "ppb_ext_crx_file_system_private_thunk.cc",
+    "ppb_file_chooser_api.h",
+    "ppb_file_chooser_dev_thunk.cc",
+    "ppb_file_chooser_trusted_thunk.cc",
+    "ppb_file_io_api.h",
+    "ppb_file_io_private_thunk.cc",
+    "ppb_file_io_thunk.cc",
+    "ppb_file_mapping_thunk.cc",
+    "ppb_file_ref_api.h",
+    "ppb_file_ref_thunk.cc",
+    "ppb_file_system_api.h",
+    "ppb_file_system_thunk.cc",
+    "ppb_find_private_thunk.cc",
+    "ppb_flash_clipboard_api.h",
+    "ppb_flash_drm_api.h",
+    "ppb_flash_font_file_api.h",
+    "ppb_flash_fullscreen_api.h",
+    "ppb_flash_functions_api.h",
+    "ppb_flash_menu_api.h",
+    "ppb_flash_message_loop_api.h",
+    "ppb_flash_print_thunk.cc",
+    "ppb_fullscreen_thunk.cc",
+    "ppb_gamepad_api.h",
+    "ppb_gamepad_thunk.cc",
+    "ppb_graphics_2d_api.h",
+    "ppb_graphics_2d_thunk.cc",
+    "ppb_graphics_3d_api.h",
+    "ppb_graphics_3d_thunk.cc",
+    "ppb_host_resolver_api.h",
+    "ppb_host_resolver_thunk.cc",
+    "ppb_host_resolver_private_api.h",
+    "ppb_host_resolver_private_thunk.cc",
+    "ppb_image_data_api.h",
+    "ppb_image_data_thunk.cc",
+    "ppb_input_event_api.h",
+    "ppb_input_event_thunk.cc",
+    "ppb_input_event_private_thunk.cc",
+    "ppb_instance_api.h",
+    "ppb_instance_private_thunk.cc",
+    "ppb_instance_thunk.cc",
+    "ppb_isolated_file_system_private_api.h",
+    "ppb_isolated_file_system_private_thunk.cc",
+    "ppb_media_stream_audio_track_api.h",
+    "ppb_media_stream_audio_track_thunk.cc",
+    "ppb_media_stream_video_track_api.h",
+    "ppb_media_stream_video_track_thunk.cc",
+    "ppb_message_loop_api.h",
+    "ppb_messaging_thunk.cc",
+    "ppb_mouse_cursor_thunk.cc",
+    "ppb_mouse_lock_thunk.cc",
+    "ppb_net_address_api.h",
+    "ppb_net_address_thunk.cc",
+    "ppb_network_list_api.h",
+    "ppb_network_list_thunk.cc",
+    "ppb_network_monitor_api.h",
+    "ppb_network_monitor_thunk.cc",
+    "ppb_network_proxy_api.h",
+    "ppb_network_proxy_thunk.cc",
+    "ppb_output_protection_api.h",
+    "ppb_output_protection_private_thunk.cc",
+    "ppb_pdf_api.h",
+    "ppb_platform_verification_api.h",
+    "ppb_printing_api.h",
+    "ppb_printing_dev_thunk.cc",
+    "ppb_scrollbar_api.h",
+    "ppb_talk_private_api.h",
+    "ppb_tcp_server_socket_private_api.h",
+    "ppb_tcp_server_socket_private_thunk.cc",
+    "ppb_tcp_socket_api.h",
+    "ppb_tcp_socket_private_api.h",
+    "ppb_tcp_socket_private_thunk.cc",
+    "ppb_tcp_socket_thunk.cc",
+    "ppb_text_input_thunk.cc",
+    "ppb_truetype_font_api.h",
+    "ppb_truetype_font_singleton_api.h",
+    "ppb_truetype_font_dev_thunk.cc",
+    "ppb_udp_socket_api.h",
+    "ppb_udp_socket_thunk.cc",
+    "ppb_udp_socket_private_api.h",
+    "ppb_udp_socket_private_thunk.cc",
+    "ppb_uma_private_thunk.cc",
+    "ppb_uma_singleton_api.h",
+    "ppb_url_loader_api.h",
+    "ppb_url_loader_thunk.cc",
+    "ppb_url_loader_trusted_thunk.cc",
+    "ppb_url_request_info_api.h",
+    "ppb_url_request_info_thunk.cc",
+    "ppb_url_response_info_api.h",
+    "ppb_url_response_info_thunk.cc",
+    "ppb_var_array_thunk.cc",
+    "ppb_var_dictionary_thunk.cc",
+    "ppb_video_capture_api.h",
+    "ppb_video_capture_thunk.cc",
+    "ppb_video_decoder_api.h",
+    "ppb_video_decoder_dev_api.h",
+    "ppb_video_decoder_thunk.cc",
+    "ppb_video_destination_private_api.h",
+    "ppb_video_destination_private_thunk.cc",
+    "ppb_video_encoder_api.h",
+    "ppb_video_encoder_thunk.cc",
+    "ppb_video_frame_api.h",
+    "ppb_video_frame_thunk.cc",
+    "ppb_video_source_private_api.h",
+    "ppb_video_source_private_thunk.cc",
+    "ppb_view_api.h",
+    "ppb_view_dev_thunk.cc",
+    "ppb_view_thunk.cc",
+    "ppb_websocket_api.h",
+    "ppb_websocket_thunk.cc",
+    "ppb_widget_api.h",
+    "ppb_widget_dev_thunk.cc",
+    "ppb_x509_certificate_private_api.h",
+    "ppb_x509_certificate_private_thunk.cc",
+    "ppb_zoom_dev_thunk.cc",
+    "thunk.h",
+  ]
+
+  if (!is_nacl) {
+    sources += [
+      "ppb_audio_input_dev_thunk.cc",
+      "ppb_broker_thunk.cc",
+      "ppb_browser_font_trusted_thunk.cc",
+      "ppb_buffer_thunk.cc",
+      "ppb_content_decryptor_private_thunk.cc",
+      "ppb_char_set_thunk.cc",
+      "ppb_flash_clipboard_thunk.cc",
+      "ppb_flash_device_id_thunk.cc",
+      "ppb_flash_drm_thunk.cc",
+      "ppb_flash_file_fileref_thunk.cc",
+      "ppb_flash_file_modulelocal_thunk.cc",
+      "ppb_flash_font_file_thunk.cc",
+      "ppb_flash_fullscreen_thunk.cc",
+      "ppb_flash_menu_thunk.cc",
+      "ppb_flash_thunk.cc",
+      "ppb_flash_message_loop_thunk.cc",
+      "ppb_gles_chromium_texture_mapping_thunk.cc",
+      "ppb_pdf_thunk.cc",
+      "ppb_platform_verification_private_thunk.cc",
+      "ppb_scrollbar_thunk.cc",
+      "ppb_talk_private_thunk.cc",
+      "ppb_url_util_thunk.cc",
+      "ppb_video_decoder_dev_thunk.cc",
+    ]
+  }
+
+  # We exclude a few more things for nacl_win64, to avoid pulling in more
+  # dependencies.
+  # TODO(GYP) this isn't correct. This should only be specifically for the
+  # nacl_win64 build (cross-compiled for a 32-bit Chrome), rather than all
+  # 64-bit builds.
+  # See also //ppapi/shared_impl
+  if (is_win && cpu_arch == "x64" && current_toolchain != default_toolchain) {
+    sources += [
+      "ppb_graphics_3d_thunk.cc",
+      "ppb_host_resolver_private_thunk.cc",
+      "ppb_tcp_server_socket_private_thunk.cc",
+      "ppb_tcp_socket_private_thunk.cc",
+      "ppb_udp_socket_private_thunk.cc",
+      "ppb_x509_certificate_private_thunk.cc",
+    ]
+  }
+
+  defines = [ "PPAPI_THUNK_IMPLEMENTATION" ]
+}
diff --git a/remoting/client/plugin/BUILD.gn b/remoting/client/plugin/BUILD.gn
index 58a89df..2f45f62 100644
--- a/remoting/client/plugin/BUILD.gn
+++ b/remoting/client/plugin/BUILD.gn
@@ -24,8 +24,8 @@ static_library("plugin") {
 
   deps = [
     "//net",
-    "//ppapi:ppapi_cpp_objects",
-    "//ppapi:ppapi_internal_module",
+    "//ppapi/cpp:objects",
+    "//ppapi/cpp/private:internal_module",
     "//remoting/base",
     "//remoting/client",
     "//remoting/protocol",
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index bc4e4ac..42bf79e 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -55,7 +55,7 @@ static_library("host") {
     deps += [
       "//cc",
       "//content",
-      "//ppapi:ppapi_host",
+      "//ppapi/host",
       "//skia",
       "//ui/aura",
       "//ui/compositor",
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
index 2fba0809..b563eb4 100644
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -75,7 +75,7 @@ source_set("adapter") {
     deps = [
       ":version_h",
       ":binaries",
-      "//ppapi:ppapi_cpp",
+      "//ppapi/cpp",
 
       #'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',  TODO(GYP)
     ]