Bug 1620962 - Part 2: Port Bug 1608610 "Remove MOZ_CALENDAR build config flag and related code". r=frg

suite/app.mozbuild

@@ -16,14 +16,9 @@ if CONFIG['MOZ_IRC']:
 if CONFIG['MOZ_DOMINSPECTOR']:
     DIRS += ['/extensions/inspector']
 
-DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
-
-if CONFIG['MOZ_CALENDAR']:
-    DIRS += [
-        '/comm/calendar/lightning',
-    ]
-
 DIRS += [
+    '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
+    '/comm/calendar',
     '/comm/editor/ui',
     '/comm/suite',
 ]

suite/installer/Makefile.in

@@ -52,10 +52,6 @@ ifdef NIGHTLY_BUILD
 DEFINES += -DNIGHTLY_BUILD=1
 endif
 
-ifdef MOZ_CALENDAR
-DEFINES += -DMOZ_CALENDAR=1
-endif
-
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif

suite/installer/package-manifest.in

@@ -524,7 +524,6 @@ man/*
 @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #endif
 
-#ifdef MOZ_CALENDAR
 [calendar]
 @RESPATH@/chrome/calendar@JAREXT@
 @RESPATH@/chrome/calendar.manifest
@@ -605,4 +604,3 @@ man/*
 @RESPATH@/components/calTransactionManager.js
 @RESPATH@/components/calWeekInfoService.js
 @RESPATH@/components/calWeekPrinter.js
-#endif