| Index: mojo/edk/embedder/BUILD.gn
 | 
| diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn
 | 
| index 5271e66deb42d03f89e16d9ed054f6cdd3269fe8..3d808d82ef62373f0e23c671a179b32699fc5ded 100644
 | 
| --- a/mojo/edk/embedder/BUILD.gn
 | 
| +++ b/mojo/edk/embedder/BUILD.gn
 | 
| @@ -2,10 +2,12 @@
 | 
|  # Use of this source code is governed by a BSD-style license that can be
 | 
|  # found in the LICENSE file.
 | 
|  
 | 
| -source_set("embedder") {
 | 
| +import("../mojo_edk.gni")
 | 
| +
 | 
| +mojo_edk_source_set("embedder") {
 | 
|    # This isn't really a standalone target; it must be linked into the
 | 
|    # mojo_system_impl component.
 | 
| -  visibility = [ "//mojo/edk/system" ]
 | 
| +  mojo_edk_visibility = [ "mojo/edk/system" ]
 | 
|  
 | 
|    sources = [
 | 
|      "channel_info_forward.h",
 | 
| @@ -30,11 +32,14 @@ source_set("embedder") {
 | 
|      "MOJO_SYSTEM_IMPLEMENTATION",
 | 
|    ]
 | 
|  
 | 
| -  configs += [ "//mojo/edk/system:system_config" ]
 | 
| +  mojo_edk_configs = [ "mojo/edk/system:system_config" ]
 | 
|  
 | 
|    public_deps = [
 | 
|      ":platform",
 | 
| -    "//mojo/public/cpp/system",
 | 
| +  ]
 | 
| +
 | 
| +  mojo_sdk_public_deps = [
 | 
| +    "mojo/public/cpp/system",
 | 
|    ]
 | 
|  
 | 
|    deps = [
 | 
| @@ -42,12 +47,15 @@ source_set("embedder") {
 | 
|    ]
 | 
|  }
 | 
|  
 | 
| -source_set("platform") {
 | 
| +mojo_edk_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",
 | 
| +  ]
 | 
| +
 | 
| +  mojo_edk_visibility = [
 | 
| +    "mojo/edk/system",
 | 
|    ]
 | 
|  
 | 
|    sources = [
 | 
| @@ -68,6 +76,7 @@ source_set("platform") {
 | 
|      "scoped_platform_handle.h",
 | 
|      "simple_platform_shared_buffer.cc",
 | 
|      "simple_platform_shared_buffer.h",
 | 
| +    "simple_platform_shared_buffer_android.cc",
 | 
|      "simple_platform_shared_buffer_posix.cc",
 | 
|      "simple_platform_shared_buffer_win.cc",
 | 
|      "simple_platform_support.cc",
 | 
| @@ -76,16 +85,16 @@ source_set("platform") {
 | 
|  
 | 
|    defines = [ "MOJO_SYSTEM_IMPL_IMPLEMENTATION" ]
 | 
|  
 | 
| -  configs += [ "//mojo/edk/system:system_config" ]
 | 
| +  mojo_edk_configs = [ "mojo/edk/system:system_config" ]
 | 
|  
 | 
|    deps = [
 | 
|      "//base",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
| -source_set("embedder_unittests") {
 | 
| +mojo_edk_source_set("embedder_unittests") {
 | 
|    testonly = true
 | 
| -  visibility = [ "//mojo/edk/system:mojo_system_unittests" ]
 | 
| +  mojo_edk_visibility = [ "mojo/edk/system:mojo_system_unittests" ]
 | 
|  
 | 
|    sources = [
 | 
|      "embedder_unittest.cc",
 | 
| @@ -96,8 +105,12 @@ source_set("embedder_unittests") {
 | 
|    deps = [
 | 
|      "//base",
 | 
|      "//base/test:test_support",
 | 
| -    "//mojo/edk/test:test_support",
 | 
| -    "//mojo/edk/system",
 | 
|      "//testing/gtest",
 | 
|    ]
 | 
| +
 | 
| +  mojo_edk_deps = [
 | 
| +    "mojo/edk/test:test_support",
 | 
| +    "mojo/edk/system",
 | 
| +    "mojo/edk/system:test_utils",
 | 
| +  ]
 | 
|  }
 | 
| 
 |