From 405ee213a9a85a3a28829a85cd2805a3f695996a Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Fri, 27 Jul 2012 13:13:43 -0400
Subject: [PATCH] Bug 772570: untangle MOZ_WEBM from MOZ_VP8 so we can disable
 webm with webrtc enabled r=def r=ted

---
 layout/media/symbols.def.in  | 2 ++
 toolkit/toolkit-makefiles.sh | 2 ++
 toolkit/toolkit-tiers.mk     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in
index f618650b14a..3ed481d1af3 100644
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -23,6 +23,8 @@ nestegg_track_seek
 nestegg_track_type
 nestegg_track_video_params
 nestegg_tstamp_scale
+#endif
+#ifdef MOZ_VP8
 #ifndef MOZ_NATIVE_LIBVPX
 vpx_codec_control_
 vpx_codec_dec_init_ver
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index b426dc6dbaf..3574e9a5350 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -1584,6 +1584,8 @@ if [ "$MOZ_WEBM" ]; then
     media/libnestegg/include/Makefile
     media/libnestegg/src/Makefile
   "
+fi
+if [ "$MOZ_VP8" ]; then
   if [ ! "$MOZ_NATIVE_LIBVPX" ]; then
     add_makefiles "
       media/libvpx/Makefile
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 7ee7ce77909..b4a9ca71f41 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -104,6 +104,9 @@ endif
 
 ifdef MOZ_WEBM
 tier_platform_dirs += media/libnestegg
+endif
+
+ifdef MOZ_VP8
 ifndef MOZ_NATIVE_LIBVPX
 tier_platform_dirs += media/libvpx
 endif