The change http://webrtc-codereview.appspot.com/299001 (commit 1062) does not do what it intends (exclude codecs from Chromium build). This is a fix for that. webrtc.gyp is not pulled in Chromium, hence it has no effect putting a define there. Moving it to src/build/common.gypi.

Review URL: http://webrtc-codereview.appspot.com/315002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1143 4adac7df-926f-26a2-2b94-8c16560cd09d

src/build/common.gypi

@@ -103,6 +103,8 @@
     'conditions': [
       ['build_with_chromium==1', {
         'defines': [
+          # Changes settings for Chromium build.
+          'WEBRTC_CHROMIUM_BUILD',
           # This turns off tracing in webrtc to reduce the noise from
           # the Chrome memory bots. Down the line we will enable WebRTC
           # tracing for Chromium and remove this.

src/modules/media_file/source/media_file_utility.cc

@@ -1493,7 +1493,10 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedReading(
         start,
         stop);
 
+#if defined(WEBRTC_CODEC_GSMAMR) || defined(WEBRTC_CODEC_GSMAMRWB) || \
+    defined(WEBRTC_CODEC_ILBC)
     WebRtc_Word16 read_len = 0;
+#endif
     _codecId = kCodecNoCodec;
     _playoutPositionMs = 0;
     _reading = false;

webrtc.gyp

@@ -26,11 +26,5 @@
     },
   ],
   'conditions': [
-    ['build_with_chromium==1', {
-      # Exclude components in engine_configuration.h.
-      'defines': [
-        'WEBRTC_CHROMIUM_BUILD',
-      ],
-    }, ],  # build_with_chromium=1
   ],  # conditions
 }