GN fixes for recent changes to media. There has not been an automated GN builder, allowing the files to become stale.

Makes BUILD.gn files current for public TOT clang build. This CL will allow us to spin up an automated builder.

BUG=516899
Bug: b/17615224

Review URL: https://codereview.chromium.org/1283253002

Cr-Commit-Position: refs/heads/master@{#343310}

5 files changed, 25 insertions, 6 deletions

diff --git a/chromecast/browser/media/BUILD.gn b/chromecast/browser/media/BUILD.gn
index 74b6754..1cdcd73 100644
--- a/chromecast/browser/media/BUILD.gn
+++ b/chromecast/browser/media/BUILD.gn
@@ -25,6 +25,7 @@ source_set("media") {
     "//chromecast/common/media",
     "//chromecast/media",
     "//chromecast/public",
+    "//chromecast/public/media",
     "//content/public/browser",
     "//media",
     "//ui/gfx/geometry",
diff --git a/chromecast/media/BUILD.gn b/chromecast/media/BUILD.gn
index eb95dcd..1a1799d 100644
--- a/chromecast/media/BUILD.gn
+++ b/chromecast/media/BUILD.gn
@@ -55,3 +55,9 @@ test("cast_media_unittests") {
     "//ui/gfx/geometry",
   ]
 }
+
+# TODO(gunsch): delete this target once Chromecast M44/earlier is obsolete.
+# See: b/21639416
+shared_library("libffmpegsumo") {
+  output_name = "libffmpegsumo"
+}
diff --git a/chromecast/media/base/BUILD.gn b/chromecast/media/base/BUILD.gn
index 1940ab3..c5ca903 100644
--- a/chromecast/media/base/BUILD.gn
+++ b/chromecast/media/base/BUILD.gn
@@ -11,10 +11,10 @@ declare_args() {
 
 source_set("base") {
   sources = [
-    "decrypt_context.cc",
-    "decrypt_context.h",
-    "decrypt_context_clearkey.cc",
-    "decrypt_context_clearkey.h",
+    "decrypt_context_impl.cc",
+    "decrypt_context_impl.h",
+    "decrypt_context_impl_clearkey.cc",
+    "decrypt_context_impl_clearkey.h",
     "key_systems_common.cc",
     "key_systems_common.h",
     "media_caps.cc",
@@ -31,6 +31,7 @@ source_set("base") {
 
   deps = [
     "//base",
+    "//chromecast/public/media",
     "//crypto",
     "//crypto:platform",
     "//media",
@@ -59,6 +60,8 @@ shared_library("libcast_media_default") {
   configs += [ "//chromecast:config" ]
 
   deps = [
+    "//chromecast/media/cma/backend",
     "//chromecast/public",
+    "//chromecast/public/media",
   ]
 }
diff --git a/chromecast/media/cma/backend/BUILD.gn b/chromecast/media/cma/backend/BUILD.gn
index 0f1dc55..fba79c2 100644
--- a/chromecast/media/cma/backend/BUILD.gn
+++ b/chromecast/media/cma/backend/BUILD.gn
@@ -18,8 +18,8 @@ source_set("backend") {
 
   deps = [
     "//base",
-    "//chromecast/media/base",
     "//chromecast/media/cma/base",
+    "//chromecast/public/media",
     "//media",
   ]
 
diff --git a/chromecast/public/media/BUILD.gn b/chromecast/public/media/BUILD.gn
index 5b00f0b..b6f699f 100644
--- a/chromecast/public/media/BUILD.gn
+++ b/chromecast/public/media/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("public") {
+source_set("media") {
   sources = [
     "audio_pipeline_device.h",
     "cast_decoder_buffer.h",
@@ -16,4 +16,13 @@ source_set("public") {
     "stream_id.h",
     "video_pipeline_device.h",
   ]
+
+  public_configs = [ ":public_headers" ]
+}
+
+# Any target which includes headers in ":media" should include it in its deps
+# so that it inherits the config below. This allows headers in ":media" to
+# include other interfaces without an absolute path from src.
+config("public_headers") {
+  include_dirs = [ "//chromecast/public" ]
 }