Simplify GN target names for //blimp

blimp/engine/BUILD.gn

 # 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("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/repack.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 49 matching lines @@
     ":app_net",
     ":app_permissions",
     ":app_settings",
     ":app_switches",
     ":app_ui",
     ":blob_channel",
     ":common",
     ":renderer",
     ":session",
     "//base",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
     "//blimp/engine:blob_channel_mojo_cpp_sources",
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//content/public/app:both",
     "//content/public/browser",
     "//content/public/common",
     "//content/public/renderer",
     "//content/public/utility",
     "//net",
   ]
 }
 
 source_set("app_config") {
@@ skipping 35 matching lines @@
   ]
 }
 
 source_set("app_settings") {
   sources = [
     "app/engine_settings.h",
     "app/settings_manager.cc",
     "app/settings_manager.h",
   ]
   deps = [
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//content/public/browser",
     "//content/public/common",
   ]
 }
 
 source_set("app_switches") {
   sources = [
     "app/switches.cc",
     "app/switches.h",
   ]
 }
 
 source_set("app_ui") {
   sources = [
     "app/ui/blimp_layout_manager.cc",
     "app/ui/blimp_layout_manager.h",
     "app/ui/blimp_screen.cc",
     "app/ui/blimp_screen.h",
     "app/ui/blimp_window_tree_client.cc",
     "app/ui/blimp_window_tree_client.h",
     "app/ui/blimp_window_tree_host.cc",
     "app/ui/blimp_window_tree_host.h",
   ]
 
   deps = [
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//cc",
     "//cc/surfaces",
     "//ui/aura",
     "//ui/compositor",
     "//ui/events",
     "//ui/gfx",
     "//ui/platform_window",
     "//ui/platform_window",
     "//ui/platform_window/stub/",
   ]
@@ skipping 33 matching lines @@
 source_set("feature") {
   sources = [
     "feature/engine_render_widget_feature.cc",
     "feature/engine_render_widget_feature.h",
     "feature/engine_settings_feature.cc",
     "feature/engine_settings_feature.h",
   ]
 
   deps = [
     "//base",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
     "//blimp/engine:app_settings",
     "//blimp/engine:common",
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//content/public/browser",
     "//content/public/common",
     "//net",
     "//ui/base",
     "//ui/base/ime",
     "//ui/resources",
     "//ui/wm",
   ]
 }
 
 source_set("renderer") {
   sources = [
     "renderer/blimp_content_renderer_client.cc",
     "renderer/blimp_content_renderer_client.h",
     "renderer/engine_image_serialization_processor.cc",
     "renderer/engine_image_serialization_processor.h",
   ]
 
   deps = [
     ":blob_channel_mojo",
     "//base",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
     "//cc",
     "//components/web_cache/renderer",
     "//content/public/common",
     "//content/public/renderer",
     "//skia",
     "//third_party/libwebp",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 }
 
 source_set("session") {
   sources = [
     "session/blimp_engine_session.cc",
     "session/blimp_engine_session.h",
   ]
 
   deps = [
     ":app_config",
     ":app_settings",
     ":app_switches",
     ":app_ui",
     ":common",
     ":feature",
     "//base",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//content/public/browser",
     "//net",
     "//ui/aura",
     "//ui/base/ime",
     "//ui/gfx/geometry",
     "//ui/wm",
   ]
 }
 
 # Implements the browser portions of the Mojo bridge to BlobChannel.
@@ skipping 43 matching lines @@
   sources = [
     "feature/engine_render_widget_feature_unittest.cc",
     "feature/engine_settings_feature_unittest.cc",
   ]
 
   deps = [
     ":feature",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
     "//blimp/engine:app_settings",
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//blimp/net:test_support",
     "//content/public/browser",
     "//net",
     "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/public:blink_headers",
     "//ui/base/ime",
   ]
 }
@@ skipping 10 matching lines @@
 if (is_linux) {
   executable("blimp_engine_app") {
     sources = [
       "app/blimp_main.cc",
     ]
 
     deps = [
       ":app",
       ":pak",
       "//base",
-      "//blimp/net:blimp_net",
+      "//blimp/net",
       "//content/public/app:both",
     ]
   }
 
-  group("blimp_engine") {
+  group("engine") {
     deps = [
       ":blimp_engine_app",
       ":pak",
       "//sandbox/linux:chrome_sandbox",
       "//third_party/blimp_fonts",
     ]
 
     # List dependencies as both deps and data_deps to ensure changes trigger a
     # rebuild and "gn desc ... runtime_deps" correctly prints the data_deps.
     data_deps = deps
   }
 
   # Builds and bundles the engine into a tarball that can be used to build a
   # Docker image.
   action("blimp_engine_bundle") {
     script = "//blimp/tools/bundle-engine.py"
 
     # These form the arguments to the script.
     _rebased_out_dir = rebase_path(root_out_dir)
     _rebased_dockerfile = rebase_path("//blimp/engine/Dockerfile")
     _rebased_startup_script = rebase_path("//blimp/engine/start_engine.sh")
     _rebased_manifest = rebase_path("//blimp/engine/engine-manifest.txt")
     _bundle = "$root_out_dir/blimp_engine_bundle.tar.gz"
 
     # Detail the target & "source"-file dependencies, and output, for GN.
     deps = [
-      "//blimp/engine:blimp_engine",
+      "//blimp/engine",
     ]
     sources = [
       _rebased_dockerfile,
       _rebased_manifest,
       _rebased_startup_script,
     ]
     outputs = [
       _bundle,
     ]
 
     # Manually specify the actual arguments to the script.
     args = [
       "--build-dir",
       _rebased_out_dir,
       "--dockerfile",
       _rebased_dockerfile,
       "--startup-script",
       _rebased_startup_script,
       "--manifest",
       _rebased_manifest,
       "--output",
       rebase_path(_bundle),
     ]
   }
 }