//mojo/edk/system -> //mojo/edk

Also //mojo/edk/embedder:headers -> //mojo/edk This makes more sense. There's some random GN autoformatting here as well. TBR=sky@chromium.org Bug: None Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: I3ade31b7f4b127f341fd114acc5c092bcba22659 Reviewed-on: https://chromium-review.googlesource.com/963548 Commit-Queue: Ken Rockot <rockot@chromium.org> Reviewed-by: Ken Rockot <rockot@chromium.org> Reviewed-by: Jay Civelli <jcivelli@chromium.org> Cr-Commit-Position: refs/heads/master@{#543536}
Denger-Network · Mar 15, 2018 · ec287c8 · ec287c8
1 parent 82fe4dd
commit ec287c8
Show file tree

Hide file tree

Showing 91 changed files with 133 additions and 148 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -1389,7 +1389,7 @@ test("ash_content_unittests") {
     "//content/public/browser",
     "//content/test:test_support",
     "//device/bluetooth",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net",
     "//skia",
     "//testing/gtest",
@@ -1695,7 +1695,7 @@ test("ash_unittests") {
     "//components/user_manager",
     "//components/user_manager:test_support",
     "//device/bluetooth",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net:net",
     "//services/ui/public/cpp/input_devices:test_support",
     "//services/ui/public/interfaces",
@@ -1769,7 +1769,7 @@ test("ash_perftests") {
     "//ash/public/cpp",
     "//base/test:test_support",
     "//cc/base",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
     "//testing/gtest",
     "//testing/perf",
     "//ui/aura",

diff --git a/ash/app_list/presenter/BUILD.gn b/ash/app_list/presenter/BUILD.gn
@@ -72,7 +72,7 @@ test("app_list_presenter_unittests") {
     "//ash:ash",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//testing/gtest",
     "//ui/app_list:test_support",
     "//ui/aura:aura",

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
@@ -739,7 +739,7 @@ cc_test("cc_unittests") {
     "//gpu/ipc:gl_in_process_context",
     "//gpu/skia_bindings",
     "//media",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//testing/gmock",
     "//testing/gtest",
@@ -791,7 +791,7 @@ cc_test("cc_perftests") {
     "//gpu/command_buffer/client:raster",
     "//gpu/ipc/common:struct_traits",
     "//media",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//services/viz/public/interfaces",
     "//skia",

diff --git a/chrome/app_shim/BUILD.gn b/chrome/app_shim/BUILD.gn
@@ -18,7 +18,7 @@ source_set("app_shim") {
     "//chrome:strings",
     "//chrome/common",
     "//ipc",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
     "//ui/base",
   ]
 }
@@ -36,7 +36,9 @@ mac_app_bundle("app_mode_loader") {
   extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
 
   info_plist_target = ":app_mode_loader_plist"
-  extra_substitutions = [ "APP_MODE_APP_BUNDLE_ID=$chrome_mac_bundle_id.app.@APP_MODE_SHORTCUT_ID@" ]
+  extra_substitutions = [
+    "APP_MODE_APP_BUNDLE_ID=$chrome_mac_bundle_id.app.@APP_MODE_SHORTCUT_ID@",
+  ]
 
   sources = [
     "app_mode_loader_mac.mm",

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1763,7 +1763,7 @@ jumbo_split_static_library("browser") {
     "//media/mojo/interfaces:remoting",
     "//media/mojo/services",
     "//mojo/common",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//net:extras",
     "//net:net_browser_services",

diff --git a/chrome/browser/vr/BUILD.gn b/chrome/browser/vr/BUILD.gn
@@ -390,7 +390,7 @@ source_set("vr_test_support") {
     "//components/security_state/core",
     "//components/toolbar:vector_icons",
     "//content/test:test_support",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility:ax_enums_mojo",

diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
@@ -262,7 +262,7 @@ static_library("common") {
     "//gpu/config",
     "//ipc",
     "//media",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//pdf:features",
     "//ppapi/features",

diff --git a/chrome/common/profiling/BUILD.gn b/chrome/common/profiling/BUILD.gn
@@ -28,7 +28,7 @@ static_library("profiling") {
     "//base/allocator:buildflags",
     "//chrome/common:constants",
     "//content/public/common",
-    "//mojo/edk/system",
+    "//mojo/edk",
   ]
 }
 
@@ -51,7 +51,7 @@ source_set("unit_tests") {
   deps = [
     ":profiling",
     "//base",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//testing/gtest",
   ]
 }
diff --git a/chrome/profiling/BUILD.gn b/chrome/profiling/BUILD.gn
@@ -39,7 +39,7 @@ static_library("profiling") {
     "//base",
     "//chrome/common",
     "//content/public/child",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//services/resource_coordinator/public/cpp:resource_coordinator_cpp",
     "//third_party/zlib",
   ]

diff --git a/chrome/service/BUILD.gn b/chrome/service/BUILD.gn
@@ -66,7 +66,7 @@ static_library("service") {
     "//components/printing/common",
     "//google_apis",
     "//jingle:notifier",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net",
     "//printing",
     "//skia",

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -4667,7 +4667,7 @@ if (!is_android) {
       "//crypto:test_support",
       "//extensions/buildflags",
       "//google_apis:test_support",
-      "//mojo/edk/system",
+      "//mojo/edk",
       "//net",
       "//net:net_resources",
       "//net:test_support",
@@ -4835,7 +4835,7 @@ if (!is_android) {
         "//ash/resources",
         "//chrome/browser/media/router:test_support",
         "//chromeos",
-        "//mojo/edk/system",
+        "//mojo/edk",
       ]
 
       data += [

diff --git a/chromecast/app/BUILD.gn b/chromecast/app/BUILD.gn
@@ -81,7 +81,7 @@ cast_source_set("test_support") {
     "//chromecast/base",
     "//content/test:test_support",
     "//ipc",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
   ]
 }
 

diff --git a/chromecast/graphics/BUILD.gn b/chromecast/graphics/BUILD.gn
@@ -87,7 +87,7 @@ if (use_aura && !is_cast_audio_only) {
     deps = [
       ":graphics",
       "//base/test:test_support",
-      "//mojo/edk/system",
+      "//mojo/edk",
       "//testing/gtest",
       "//ui/aura",
       "//ui/aura:test_support",

diff --git a/components/arc/BUILD.gn b/components/arc/BUILD.gn
@@ -93,7 +93,7 @@ static_library("arc") {
     "//device/usb/mojo",
     "//device/usb/public/mojom",
     "//google_apis",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//services/device/public/mojom",
     "//skia",
     "//third_party/re2:re2",
@@ -164,7 +164,7 @@ static_library("arc_base") {
     "//components/prefs",
     "//components/signin/core/account_id",
     "//components/user_manager",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//ui/aura",
   ]
 
@@ -223,7 +223,7 @@ static_library("arc_test_support") {
     "//components/user_prefs",
     "//content/test:test_support",
     "//mojo/common:common_base",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
   ]
 }
 

diff --git a/components/exo/BUILD.gn b/components/exo/BUILD.gn
@@ -198,7 +198,7 @@ test("exo_unittests") {
     "//cc:test_support",
     "//components/viz/test:test_support",
     "//device/gamepad:test_helpers",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
     "//testing/gtest",
     "//ui/aura",
     "//ui/aura:test_support",

diff --git a/components/exo/wayland/BUILD.gn b/components/exo/wayland/BUILD.gn
@@ -336,7 +336,7 @@ test("wayland_client_perftests") {
     "//cc:test_support",
     "//components/exo",
     "//components/viz/test:test_support",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
     "//testing/perf",
     "//ui/aura",
     "//ui/aura:test_support",

diff --git a/components/nacl/broker/BUILD.gn b/components/nacl/broker/BUILD.gn
@@ -28,7 +28,7 @@ source_set("broker") {
     "//components/nacl/common:switches",
     "//content/public/common:static_switches",
     "//ipc",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//sandbox",
     "//services/service_manager/public/cpp",
   ]

diff --git a/components/nacl/browser/BUILD.gn b/components/nacl/browser/BUILD.gn
@@ -40,7 +40,7 @@ static_library("browser") {
     "//content/public/browser",
     "//content/public/common",
     "//content/public/common:zygote_buildflags",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//native_client/src/trusted/service_runtime:sel_main_chrome",
     "//net",
     "//ppapi/host",

diff --git a/components/nacl/common/BUILD.gn b/components/nacl/common/BUILD.gn
@@ -37,7 +37,7 @@ if (enable_nacl) {
       "//base",
       "//base:base_static",
       "//content/public/common:service_names",
-      "//mojo/edk/system",
+      "//mojo/edk",
       "//services/service_manager/public/cpp",
     ]
   }

diff --git a/components/nacl/loader/BUILD.gn b/components/nacl/loader/BUILD.gn
@@ -36,7 +36,7 @@ source_set("minimal") {
     "//components/nacl/common:mojo_bindings",
     "//crypto",
     "//ipc",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//native_client/src/trusted/service_runtime:sel_main_chrome",
     "//ppapi/c",
     "//ppapi/proxy:ipc",
@@ -126,7 +126,7 @@ if (is_linux) {
       "//content/public/common",
       "//crypto",
       "//ipc",
-      "//mojo/edk/system",
+      "//mojo/edk",
       "//sandbox/linux:sandbox_services",
       "//services/service_manager/sandbox",
       "//url/ipc:url_ipc",
@@ -205,7 +205,7 @@ if (is_win && target_cpu == "x86" && current_cpu == "x64") {
       "//components/nacl/broker",
       "//components/nacl/common:switches",
       "//content/public/common:static_switches",
-      "//mojo/edk/system",
+      "//mojo/edk",
       "//sandbox",
       "//services/service_manager/sandbox:sandbox",
     ]
@@ -235,7 +235,7 @@ if (is_nacl_nonsfi) {
       "//components/tracing",
       "//content",
       "//ipc",
-      "//mojo/edk/system",
+      "//mojo/edk",
       "//native_client/src/nonsfi/irt:nacl_sys_private",
       "//native_client/src/nonsfi/loader:elf_loader",
 

diff --git a/components/test/BUILD.gn b/components/test/BUILD.gn
@@ -18,7 +18,7 @@ source_set("test_support") {
     "//components/content_settings/core/common",
     "//components/gcm_driver:gcm_driver",
     "//components/signin/core/browser",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net",
     "//testing/gtest",
     "//ui/base",
@@ -65,7 +65,9 @@ if (enable_basic_printing || enable_print_preview) {
   # There is only one service in catalog, which depends on printing feature.
   # When more services are added, the condition can be moved inside of catalog.
   catalog("components_unittests_catalog") {
-    embedded_services = [ "//components/printing/service:pdf_compositor_service_unittest_manifest" ]
+    embedded_services = [
+      "//components/printing/service:pdf_compositor_service_unittest_manifest",
+    ]
   }
 
   catalog_cpp_source("components_unittests_catalog_source") {

diff --git a/components/viz/BUILD.gn b/components/viz/BUILD.gn
@@ -19,7 +19,7 @@ viz_test("viz_unittests") {
     "//components/viz/test:test_suite",
     "//components/viz/test:test_support",
     "//components/viz/test:unit_tests",
-    "//mojo/edk/system",
+    "//mojo/edk",
   ]
 
   data = [

diff --git a/components/viz/host/BUILD.gn b/components/viz/host/BUILD.gn
@@ -82,6 +82,6 @@ fuzzer_test("hit_test_query_fuzzer") {
     ":host",
     "//base/test:test_support",
     "//components/viz/test:test_support",
-    "//mojo/edk/system",
+    "//mojo/edk",
   ]
 }
diff --git a/components/webcrypto/BUILD.gn b/components/webcrypto/BUILD.gn
@@ -109,7 +109,7 @@ source_set("fuzzer_support") {
     "//base",
     "//crypto",
     "//crypto:platform",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//third_party/WebKit/public:blink",
   ]
 }

diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
@@ -32,7 +32,7 @@ template("implement_content_app") {
     "//services/service_manager/embedder",
     "//services/service_manager/public/mojom",
     "//services/service_manager/runner/common",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//ppapi/features",
     "//ui/base",
     "//ui/gfx",

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -109,7 +109,7 @@ jumbo_source_set("browser") {
     "//media/mojo/services",
     "//mojo/common",
     "//mojo/common:values_struct_traits",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js:resources",
     "//net",

diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
@@ -107,7 +107,7 @@ target(link_target_type, "child") {
     "//media",
     "//media/blink",
     "//mojo/common",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net",
     "//services/device/public/cpp:device_features",
     "//services/device/public/cpp/power_monitor",

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
@@ -360,7 +360,7 @@ source_set("common") {
     "//media/midi",
     "//media/midi:mojo",
     "//mojo/common:common_base",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net",
     "//ppapi/features",
     "//sandbox",

diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
@@ -259,7 +259,7 @@ jumbo_source_set("common_sources") {
     "//content/common",
     "//ipc",
     "//media/capture:capture_base",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//net",
     "//services/network:network_service",

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -322,7 +322,7 @@ jumbo_static_library("test_support") {
     "//media",
     "//media/capture",
     "//media/capture/mojom:image_capture",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net:test_support",
     "//services/device/public/mojom",
 
@@ -893,7 +893,7 @@ test("content_browsertests") {
     "//ipc",
     "//ipc:test_support",
     "//media:test_support",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//net:test_support",
     "//ppapi/features",
@@ -1702,7 +1702,7 @@ test("content_unittests") {
     "//media/capture",
     "//media/midi:midi",
     "//media/midi:mojo",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/test_support:test_utils",
     "//net:extras",