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

Unified Diff: media/media.gyp

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
« media/base/BUILD.gn ('K') | « media/cast/cast_testing.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 804024c24a61a74e0afd952a5292753eac06b803..1b34f49ba29d8a460a7de59a588868762425c38e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -64,6 +64,7 @@
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../url/url.gyp:url_lib',
+ 'media_resources',
'shared_memory_support',
],
'export_dependent_settings': [
@@ -1155,6 +1156,20 @@
], # target_conditions
},
{
+ # GN version: //media/base:media_resources
+ # Minimal resources target so chrome/ doesn't need to depend on all of
+ # media.
+ 'target_name': 'media_resources',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'sources': [
+ 'base/media_resources.cc',
+ 'base/media_resources.h',
+ ],
+ },
+ {
# GN version: //media:media_unittests
'target_name': 'media_unittests',
'type': '<(gtest_target_type)',
@@ -1592,6 +1607,7 @@
'type': 'static_library',
'dependencies': [
'media',
+ 'media_resources',
'shared_memory_support',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -1613,6 +1629,8 @@
'base/fake_audio_renderer_sink.h',
'base/fake_demuxer_stream.cc',
'base/fake_demuxer_stream.h',
+ 'base/fake_media_resources.cc',
+ 'base/fake_media_resources.h',
'base/fake_output_device.cc',
'base/fake_output_device.h',
'base/fake_text_track_stream.cc',
« media/base/BUILD.gn ('K') | « media/cast/cast_testing.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698