Bug 799975 - Fix webrtc when building with system nspr/nss. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 17 Oct 2012 16:33:23 +0200
changeset 110673 17ee39da56c8f8600ab8c1528b36a2bcf66c3f7d
parent 110672 0fea15c742aaac371e70f995218ca1054322c875
child 110674 543ce048124c3088c81071dfd650f538cface853
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersted
bugs799975
milestone19.0a1
Bug 799975 - Fix webrtc when building with system nspr/nss. r=ted
media/webrtc/signaling/signaling.gyp
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -34,17 +34,16 @@
         './src/media',
         './src/media-conduit',
         './src/mediapipeline',
         './src/softphonewrapper',
         './src/peerconnection',
         './include',
         './src/sipcc/include',
         './src/sipcc/cpr/include',
-        '../../../nsprpub/pr/include',
         '../../../ipc/chromium/src',
         '../../../ipc/chromium/src/base/third_party/nspr',
         '../../../xpcom/base',
         '$(DEPTH)/dist/include',
         '../../../dom/base',
         '../../../media/mtransport',
         '../trunk/src',
         '../trunk/src/video_engine/include',
@@ -156,16 +155,21 @@
         'HAVE_STDLIB_H=1',
         'INTEGER_TYPES_H="\\"mozilla/StandardInteger.h\\""',
         'HAVE_UINT8_T=1',
         'HAVE_UINT16_T=1',
         'HAVE_UINT32_T=1',
         'HAVE_UINT64_T=1',
       ],
 
+      'cflags_mozilla': [
+        '$(NSPR_CFLAGS)',
+        '$(NSS_CFLAGS)',
+      ],
+
       #
       # Conditionals
       #
       'conditions': [
         ['build_for_test==0', {
           'defines' : [
             'MOZILLA_INTERNAL_API'
           ],
@@ -240,17 +244,16 @@
         './src/sipcc/core/includes',
         './src/sipcc/cpr/include',
         './src/sipcc/core/common',
         './src/sipcc/core/sipstack/h',
         './src/sipcc/core/ccapp',
         './src/sipcc/core/sdp',
         './src/sipcc/core/gsm/h',
         './src/sipcc/plat/common',
-        '../../../nsprpub/pr/include',
         '../../../media/mtransport',
         '../../../dom/base',
         '../trunk/third_party/libsrtp/srtp/include',
         '../trunk/third_party/libsrtp/srtp/crypto/include',
         '$(DEPTH)/dist/include',
         # Danger: this is to include config.h. This could be bad.
         '../trunk/third_party/libsrtp/config',
       ],
@@ -574,16 +577,20 @@
 
       #
       # DEFINES
       #
       
       'defines' : [
       ],
 
+      'cflags_mozilla': [
+        '$(NSPR_CFLAGS)',
+      ],
+
       #
       # OS SPECIFIC
       #      
       'conditions': [
         ['OS=="linux"', {
           'include_dirs': [
           ],