Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: media/base/BUILD.gn

Issue 1362093002: Re-land: Add localized default audio device names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove MEDIA_EXPORT. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/win/audio_manager_win.cc ('k') | media/base/fake_media_resources.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/BUILD.gn
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index 40641c424156523c77d0127e133721acc0dd1ded..ff622ddf63dca3511a75cdc4204f857a151966bb 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -204,6 +204,7 @@ source_set("base") {
defines = []
public_deps = []
deps = [
+ ":media_resources",
"//ui/events:events_base",
"//skia",
]
@@ -294,6 +295,17 @@ source_set("base") {
}
}
+# Minimal resources target so chrome/ doesn't need to depend on all of media.
+source_set("media_resources") {
Nico 2015/09/24 00:37:16 This seems fiddly to me. That's a source_set, so t
ajm 2015/09/24 00:45:39 Yep. It's pretty tiny, and I don't expect it to ge
+ sources = [
+ "media_resources.cc",
+ "media_resources.h",
+ ]
+ deps = [
+ "//base",
+ ]
+}
+
# Minimal media component for media/cast on iOS.
config("base_for_cast_ios_dependent_config") {
defines = [ "MEDIA_FOR_CAST_IOS" ]
@@ -336,6 +348,8 @@ source_set("test_support") {
"fake_audio_renderer_sink.h",
"fake_demuxer_stream.cc",
"fake_demuxer_stream.h",
+ "fake_media_resources.cc",
+ "fake_media_resources.h",
"fake_output_device.cc",
"fake_output_device.h",
"fake_text_track_stream.cc",
@@ -356,6 +370,7 @@ source_set("test_support") {
]
configs += [ "//media:media_config" ]
deps = [
+ ":media_resources",
"//testing/gmock",
]
}
« no previous file with comments | « media/audio/win/audio_manager_win.cc ('k') | media/base/fake_media_resources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698