bug 1409721 - move crashreporter.ini and crashreporter-override.ini to moz.build LOCALIZED_FILES. r=nalexander

The additional `ifndef IS_LANGPACK` Makefile bits turned out to be unnecessary,
as langpack packaging excludes ini files:
https://dxr.mozilla.org/mozilla-central/rev/20d57b9c4183973af4af5e078dff2aec0b74f928/toolkit/locales/l10n.mk#220

We already don't have this wrapping around updater.ini so it doesn't seem
harmful.

MozReview-Commit-ID: 7kmg1AIVLcl

--HG--
extra : rebase_source : d0ea61865ad0b07054b894335f9266f19c1495f5
extra : source : 0e485a8fdc3f45ae4cdad75e010765fb48aa20c4

browser/locales/Makefile.in

@@ -185,13 +185,6 @@ else
 endif
 endif
 
-ifndef IS_LANGPACK
-ifdef MOZ_CRASHREPORTER
-libs:: $(call MERGE_FILE,crashreporter/crashreporter-override.ini)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
-endif
-endif
-
 ident:
 	@printf 'fx_revision '
 	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \

browser/locales/moz.build

@@ -6,6 +6,9 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
+if CONFIG['MOZ_CRASHREPORTER']:
+    LOCALIZED_FILES += ['en-US/crashreporter/crashreporter-override.ini']
+
 with Files("**"):
     BUG_COMPONENT = ("Toolkit", "Build Config")
 

toolkit/locales/Makefile.in

@@ -23,14 +23,3 @@ chrome-%:
 
 libs:: update.locale
 	sed -e 's/%AB_CD%/$(AB_CD)/' $< > $(FINAL_TARGET)/update.locale
-
-ifndef IS_LANGPACK
-ifdef MOZ_CRASHREPORTER
-libs:: $(call MERGE_FILE,crashreporter/crashreporter.ini)
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/crashreporter.app/Contents/Resources
-else
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
-endif
-endif
-endif

toolkit/locales/moz.build

@@ -23,3 +23,14 @@ multilocale.script = 'gen_multilocale.py'
 FINAL_TARGET_FILES.res += [
     '!multilocale.json',
 ]
+
+if CONFIG['MOZ_CRASHREPORTER']:
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+        # TODO: fixing bug 1223748 should let us remove this special case
+        LOCALIZED_FILES['crashreporter.app'].Contents.Resources += [
+            'en-US/crashreporter/crashreporter.ini'
+        ]
+    else:
+        LOCALIZED_FILES += [
+            'en-US/crashreporter/crashreporter.ini'
+        ]