Clean up media/mojo target names.

media/mojo/services/BUILD.gn

 # Copyright 2014 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("//mojo/public/mojo_application.gni")
 
-# Things needed by multiple targets, like renderer_impl and renderer_app.
-# GYP version: media/media.gyp:media_mojo_lib
-source_set("lib") {
+# Naming conventions:
+# - common: Utility helpers shared by multiple targets.
+# - proxy: C++ implementations supported by mojo services.
+# - service: Mojo interface implementations.
+# - app: Mojo app providing one or more services.
+# - unittests: Unit tests for a particular class/file.
+# - apptest: Tests for a particular app.
+
+# Common helpers needed by multiple targets.
+# GYP version: media/media.gyp:mojo_common
+source_set("common") {

[jamesr, 2014/12/04 23:45:38]

we call converters 'converters' in other parts of the tree

[xhwang, 2014/12/05 06:23:29]

Done.

   deps = [
     "//base",
     "//media",
     "//media/mojo/interfaces",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
     "//mojo/public/c/system:for_component",
     "//mojo/services/public/interfaces/geometry",
     "//skia",
   ]
 
   sources = [

[jamesr, 2014/12/04 23:45:38]

sources should go before deps

[xhwang, 2014/12/05 06:23:29]

Done.

     "media_type_converters.cc",
     "media_type_converters.h",
-    "mojo_demuxer_stream_adapter.cc",
-    "mojo_demuxer_stream_adapter.h",
   ]
 }
 
 # mojo media::Renderer proxy (to a renderer_app) implementation.
-source_set("renderer_impl_lib") {
+source_set("renderer_proxy") {
   deps = [
-    ":lib",
     "//base",
     "//media",
     "//media/mojo/interfaces",
     "//mojo/public/interfaces/application",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/public/c/system:for_component",
     "//mojo/public/cpp/application",
+    ":common",

[jamesr, 2014/12/04 23:45:38]

run 'gn format' - local deps should go before absolute ones

[xhwang, 2014/12/05 06:23:29]

Thanks for the info!

However, "gn format" doesn't work for me now :(

ERROR Unable to load
"usr/local/google/workspace/chrome2/src/media/mojo/BUILD.gn".

   ]
 
   sources = [
     "mojo_demuxer_stream_impl.cc",
     "mojo_demuxer_stream_impl.h",
     "mojo_renderer_impl.cc",
     "mojo_renderer_impl.h",

[xhwang, 2014/12/03 23:22:03]

Should we actually move these to a "cpp" folder, similar to
mojo/services/public/cpp?

[jamesr, 2014/12/04 23:45:38]

I don't think so (that pattern is useful if you want to support client libraries
in multiple languages, but if you only support talking to your interface from
C++ the extra indirection is not very helpful)

[xhwang, 2014/12/05 06:23:29]

Acknowledged.

   ]
 }
 
-# mojo media::Renderer application.
-# GYP version: media/media.gyp:mojo_media_renderer_app
-mojo_native_application("renderer_app") {
-  output_name = "mojo_media_renderer_app"
-
+# mojo media::Renderer service.
+source_set("renderer_service") {
   deps = [
     "//base",
     "//media",
     "//media:shared_memory_support",
     "//media/mojo/interfaces",
     "//mojo/common",
-    "//mojo/application",
-    "//mojo/public/c/system:for_shared_library",
-    ":lib",
+    ":common",
   ]
 
   sources = [
     "demuxer_stream_provider_shim.cc",
     "demuxer_stream_provider_shim.h",
+    "mojo_demuxer_stream_adapter.cc",
+    "mojo_demuxer_stream_adapter.h",
     "mojo_renderer_service.cc",
     "mojo_renderer_service.h",
     "renderer_config.cc",
     "renderer_config.h",
     "renderer_config_default.cc",
   ]
 }
 
-test("mojo_media_lib_unittests") {
-  sources = [
-    "media_type_converters_unittest.cc",
+# GYP version: media/media.gyp:mojo_media_app
+mojo_native_application("media_app") {
+  output_name = "media"

[jamesr, 2014/12/04 23:45:38]

it's kind of weird to have mojo_native_application() but then override the
output_name.  why not just name the target what you want the output to be?

[xhwang, 2014/12/05 06:23:29]

Done.

+
+  deps = [
+    "//mojo/application",
+    "//mojo/public/c/system:for_shared_library",
+    ":renderer_service",
   ]
 
+  sources = [
+    "mojo_media_application.cc",
+  ]
+}
+
+# GYP version: media/media.gyp:media_mojo_unittests
+test("unittests") {
+  output_name = "media_mojo_unittests"
   deps = [
     "//base",
     "//base/test:test_support",
     "//media",
     "//media/mojo/interfaces",
     "//mojo/edk/system",
     "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//testing/gtest",
-    ":lib"
+    ":common"
+  ]
+
+  sources = [
+    "media_type_converters_unittest.cc",
   ]
 }
 
 # Not a 'test' because this is loaded via mojo_shell as an app.
 # To run the test:
-#   out/Debug/mojo_shell mojo:mojo_media_renderer_apptest
-# You may need to get "mojo_shell" from a mojo checkout and symlink all required
-# libraries.
+#   out/Debug/mojo_shell mojo:media_apptest
+# You can get "mojo_shell" using mojo/public/tools/download_shell_binary.py
+# GYP version: N/A
 # TODO(msw): Fix GYP build for ApplicationTestBase so that we can add a GYP
 # version of this test.

[jamesr, 2014/12/04 23:45:38]

you can delete this comment now

[xhwang, 2014/12/05 06:23:29]

Done.

-mojo_native_application("media_renderer_apptest") {
+mojo_native_application("apptest") {
   testonly = true
-  output_name = "mojo_media_renderer_apptest"
+  output_name = "media_apptest"
 
   deps = [
     "//base",
     "//media",
     "//media:shared_memory_support",
     "//media/mojo/interfaces",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common",
     "//mojo/environment:chromium",
-    ":renderer_impl_lib",
-    ":renderer_app",
-    ":lib",
     "//mojo/public/c/system:for_shared_library",
+    ":media_app",
+    ":renderer_proxy",
   ]
 
   sources = [
     "media_renderer_apptest.cc",
   ]
 }
 
 group("services") {
   deps = [
-    ":lib",
-    ":renderer_impl_lib",
-    ":renderer_app",
+    ":media_app",
+    ":renderer_proxy",
   ]
 }
 
 group("tests") {
   testonly = true
   deps = [
-    ":mojo_media_lib_unittests",
-    ":media_renderer_apptest",
+    ":apptest",
+    ":unittests",
   ]
 }