summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorshadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-12 04:47:40 +0000
committershadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-12 04:47:40 +0000
commit073a22b657722868df4069d680646b7481ff9802 (patch)
treecaca993eb5a4c569624e0f9ae5722c8cbc5e7759 /media/media.gyp
parent2ca7594cad9b497998b2b5102be086e51dc00d08 (diff)
downloadchromium_src-073a22b657722868df4069d680646b7481ff9802.zip
chromium_src-073a22b657722868df4069d680646b7481ff9802.tar.gz
chromium_src-073a22b657722868df4069d680646b7481ff9802.tar.bz2
Have media content and chrome browser tests load data from media/test/data
With media files copied over to media/test/data, this CL makes media related content browser tests and chrome browser tests load test data from one location. The location is common with media unit tests data forder; managed in one place in media/base/test_data_util.h BUG=379314 Review URL: https://codereview.chromium.org/357413002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index fdccc42..00ad811 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1349,6 +1349,7 @@
'media',
'shared_memory_support',
'../base/base.gyp:base',
+ '../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',