Bug 901561 - Move CMSRCS to moz.build. r=gps

config/config.mk

@@ -36,6 +36,7 @@ endif
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
   ANDROID_RESFILES \
+  CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
   DIRS \

js/src/config/config.mk

@@ -36,6 +36,7 @@ endif
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
   ANDROID_RESFILES \
+  CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
   DIRS \

python/mozbuild/mozbuild/frontend/emitter.py

@@ -179,6 +179,7 @@ class TreeMetadataEmitter(LoggingMixin):
                 '.s': 'ASFILES',
                 '.asm': 'ASFILES',
                 '.c': 'CSRCS',
+                '.m': 'CMSRCS',
                 '.mm': 'CMMSRCS',
                 '.cc': 'CPPSRCS',
                 '.cpp': 'CPPSRCS',

toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in

@@ -4,13 +4,6 @@
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
-# This is a little weird, but we're building a host and a target lib here.
-# The host lib is used for dump_syms, and the target lib for the
-# crash reporter client.  Therefore, we don't need all the srcs in both.
-CMSRCS = \
-  HTTPMultipartUpload.m \
-  $(NULL)
-
 HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)

toolkit/crashreporter/google-breakpad/src/common/mac/moz.build

@@ -17,10 +17,14 @@ SOURCES += [
     'string_utilities.cc',
 ]
 
+# This is a little weird, but we're building a host and a target lib here.
+# The host lib is used for dump_syms, and the target lib for the
+# crash reporter client.  Therefore, we don't need all the srcs in both.
 HOST_SOURCES += SOURCES
 
 HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s'
 SOURCES += [
+    'HTTPMultipartUpload.m',
     'MachIPC.mm',
 ]