Stop linking in the old Mojo EDK.

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 e307ed102bcb0fa2e419ac5d96e41f459bfb0267..3f0baebae029e183b2246c7a613fe163bbb54971 100644
--- a/mojo/edk/embedder/BUILD.gn
+++ b/mojo/edk/embedder/BUILD.gn
@@ -2,6 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+source_set("headers") {
+  sources = [
+    "configuration.h",
+    "embedder.h",
+    "embedder_internal.h",
+  ]
+
+  deps = [
+    "//base",
+    "//mojo/public/cpp/system",
+  ]
+}
+
 source_set("embedder") {
   # This isn't really a standalone target; it must be linked into the
   # mojo_system_impl component.
@@ -11,10 +24,7 @@ source_set("embedder") {
   ]
 
   sources = [
-    "configuration.h",
     "embedder.cc",
-    "embedder.h",
-    "embedder_internal.h",
     "entrypoints.cc",
 
     # Test-only code:
@@ -34,6 +44,7 @@ source_set("embedder") {
 
   public_deps = [
     ":delegates",
+    ":headers",
     ":platform",
     "//mojo/public/cpp/system",
   ]
@@ -49,6 +60,8 @@ source_set("platform") {
   visibility = [
     ":embedder",
     "//mojo/edk/system",
+    "//mojo/platform_handle:platform_handle",
+    "//mojo/platform_handle:platform_handle_impl",
   ]
 
   sources = [
@@ -114,12 +127,11 @@ source_set("delegates") {
   ]
 }
 
-# TODO(use_chrome_edk): remove "2"
-source_set("embedder_unittests2") {
+source_set("embedder_unittests") {
   testonly = true
 
-  # TODO(use_chrome_edk): remove "2". Also enable this visibility check when we
-  # figure out why it's failing just on Android.
+  # TODO(jam) enable this visibility check when we figure out why it's failing
+  # just on Android.
   #visibility = [ "//mojo/edk/system:mojo_system_unittests2" ]
 
   sources = [
@@ -131,17 +143,10 @@ source_set("embedder_unittests2") {
   deps = [
     "//base",
     "//base/test:test_support",
-    "//mojo/message_pump",
-
-    # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
-    # declared in third party only for now.
+    "//mojo/edk/system",
     "//mojo/edk/system:test_utils",
     "//mojo/edk/test:test_support",
+    "//mojo/message_pump",
     "//testing/gtest",
-    "//third_party/mojo/src/mojo/edk/system",
-
-    # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are
-    # declared in third party only for now.
-    "//third_party/mojo/src/mojo/edk/system",
   ]
 }