mozilla-central: changeset 152397:5a85d47b5642bd7fa1259fc82100cde9ab32f354

author	Jaroslav Kopecký <jaro@pluto.invalid>
	Sun, 27 Oct 2013 19:43:04 -0400
changeset 152397	5a85d47b5642bd7fa1259fc82100cde9ab32f354
parent 152396	4ec6e8c7c2ceaa19dc8cfcb1708971c0ae4c37cf
child 152398	b490b5843f3c708e093dfecb5f7e19e662989f4b
push id	25535
push user	rjesup@wgate.com
push date	Sun, 27 Oct 2013 23:49:03 +0000
treeherder	mozilla-central@b490b5843f3c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jesup
bugs	931590
milestone	27.0a1
first release with	nightly linux32 4646259ab62d / 27.0a1 / 20131028030205 / files nightly linux64 4646259ab62d / 27.0a1 / 20131028030205 / files nightly mac 4646259ab62d / 27.0a1 / 20131028030205 / files nightly win32 4646259ab62d / 27.0a1 / 20131028030205 / files nightly win64 4646259ab62d / 27.0a1 / 20131028030205 / files
last release without	nightly linux32 a80dce1126db / 27.0a1 / 20131027030205 / files nightly linux64 a80dce1126db / 27.0a1 / 20131027030205 / files nightly mac a80dce1126db / 27.0a1 / 20131027030205 / files nightly win32 a80dce1126db / 27.0a1 / 20131027030205 / files nightly win64 a80dce1126db / 27.0a1 / 20131027030205 / files

--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
@@ -42,17 +42,19 @@
         'audio_device_config.h',
         'dummy/audio_device_dummy.h',
         'dummy/audio_device_utility_dummy.h',
       ],
       'conditions': [
         ['build_with_mozilla==1', {
           'include_dirs': [
             '$(DIST)/include',
-            '$(DIST)/include/nspr',
+          ],
+          'cflags_mozilla': [
+            '$(NSPR_CFLAGS)',
           ],
         }],
         ['OS=="linux" or include_alsa_audio==1 or include_pulse_audio==1', {
           'include_dirs': [
             'linux',
           ],
         }], # OS=="linux" or include_alsa_audio==1 or include_pulse_audio==1
         ['OS=="ios"', {