Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480

mojo/edk/embedder/BUILD.gn

Index: mojo/edk/embedder/BUILD.gn
diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn
index 3bd9df007243f52013925f7a6eb8b0012355f56b..50e93b0485185796c552b4635547cdae39d33a25 100644
--- a/mojo/edk/embedder/BUILD.gn
+++ b/mojo/edk/embedder/BUILD.gn
@@ -3,26 +3,11 @@
 # found in the LICENSE file.
 
 source_set("embedder") {
-  # This isn't really a standalone target; it must be linked into the
+  # This isn't really a standalone target, it must be linked into the
   # mojo_system_impl component.
   visibility = [ "//mojo/edk/system" ]
 
-  sources = [
-    "channel_info_forward.h",
-    "channel_init.cc",
-    "channel_init.h",
-    "configuration.h",
-    "embedder.cc",
-    "embedder.h",
-    "embedder_internal.h",
-    "entrypoints.cc",
-    # Test-only code:
-    # TODO(vtl): It's a little unfortunate that these end up in the same
-    # component as non-test-only code. In the static build, this code should
-    # hopefully be dead-stripped.
-    "test_embedder.cc",
-    "test_embedder.h",
-  ]
+  deps = [ "//base", ]
 
   defines = [
     "MOJO_SYSTEM_IMPL_IMPLEMENTATION",
@@ -31,23 +16,12 @@
 
   configs += [ "//mojo/edk/system:system_config" ]
 
-  public_deps = [
-    ":platform",
-    "//mojo/public/cpp/system",
-  ]
-
-  deps = [ "//base" ]
-}
-
-source_set("platform") {
-  # This isn't really a standalone target; it must be linked into the
-  # mojo_system_impl component.
-  visibility = [
-    ":embedder",
-    "//mojo/edk/system",
-  ]
-
   sources = [
+    "channel_info_forward.h",
+    "channel_init.cc",
+    "channel_init.h",
+    "embedder.cc",
+    "embedder.h",
     "platform_channel_pair.cc",
     "platform_channel_pair.h",
     "platform_channel_pair_posix.cc",
@@ -69,30 +43,30 @@
     "simple_platform_shared_buffer_win.cc",
     "simple_platform_support.cc",
     "simple_platform_support.h",
+    # Test-only code:
+    # TODO(vtl): It's a little unfortunate that these end up in the same
+    # component as non-test-only code. In the static build, this code should
+    # hopefully be dead-stripped.
+    "test_embedder.cc",
+    "test_embedder.h",
   ]
-
-  defines = [ "MOJO_SYSTEM_IMPL_IMPLEMENTATION" ]
-
-  configs += [ "//mojo/edk/system:system_config" ]
-
-  deps = [ "//base" ]
 }
 
 source_set("embedder_unittests") {
   testonly = true
   visibility = [ "//mojo/edk/system:mojo_system_unittests" ]
+  testonly = true
+
+  deps = [
+    "//base",
+    "//mojo/edk/test:test_support",
+    "//mojo/edk/system",
+    "//testing/gtest",
+  ]
 
   sources = [
     "embedder_unittest.cc",
     "platform_channel_pair_posix_unittest.cc",
     "simple_platform_shared_buffer_unittest.cc",
   ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//mojo/edk/test:test_support",
-    "//mojo/edk/system",
-    "//testing/gtest",
-  ]
 }