diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 19:47:04 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 19:47:04 +0000 |
| commit | 0e04359183a6b6e16352685e3c75160f38a2c456 (patch) | |
| tree | ba88d77ef2a29d2075c899563251733a4a18d69b /media | |
| parent | 593b4857b8d3f1dc532585c2fb99c9e0f3d3f4e9 (diff) | |
| download | chromium_src-0e04359183a6b6e16352685e3c75160f38a2c456.zip chromium_src-0e04359183a6b6e16352685e3c75160f38a2c456.tar.gz chromium_src-0e04359183a6b6e16352685e3c75160f38a2c456.tar.bz2 | |
Make content_shell link in the GN build.
It doesn't run yet. This disables WebRTC since that's not done yet.
Libvpx isn't done either. This patch exports the disable flag for this from media to dependent targets like the GYP build does. It adds one extra check for this flag in Pepper. I assume everybody that compiles without libvpx also disables plugins so this has never come up before.
Disable some warnings in Mesa.
The resulting binary does not yet run.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/419913003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/BUILD.gn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/BUILD.gn b/media/BUILD.gn index f2acd92..4f2360c 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -15,9 +15,6 @@ config("media_config") { if (cpu_arch == "arm" && arm_use_neon) { defines += [ "USE_NEON" ] } - if (!media_use_libvpx) { - defines += [ "MEDIA_DISABLE_LIBVPX" ] - } if (use_pulseaudio) { defines += [ "USE_PULSEAUDIO" ] if (linux_link_pulseaudio) { @@ -33,6 +30,9 @@ config("media_config") { } config("media_dependent_config") { + if (!media_use_libvpx) { + defines = [ "MEDIA_DISABLE_LIBVPX" ] + } if (is_win) { ldflags = [ "/DELAYLOAD:mf.dll", |