summaryrefslogtreecommitdiff
path: root/toolkit/modules
diff options
context:
space:
mode:
authorAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-18 20:35:10 -0400
committerAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-18 20:35:10 -0400
commitaf7e140d4ed8f5bc9a69da2f0338ad3cb1319dec (patch)
tree4aac6c4383fb9e279fccb13c65a4e44595fd4cf6 /toolkit/modules
parent40fc72376411587e7bf9985fb9545eca1c9aaa8e (diff)
parent51722cd4fecb5c8c79a302f2771cad71535df5ea (diff)
downloaduxp-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.gz
Merge branch 'master' into default-pref
Diffstat (limited to 'toolkit/modules')
-rw-r--r--toolkit/modules/AppConstants.jsm7
-rw-r--r--toolkit/modules/moz.build3
2 files changed, 1 insertions, 9 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 1e2204f7ee..ae0eea1c48 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -102,13 +102,6 @@ MOZ_SAFE_BROWSING:
false,
#endif
- MOZ_SERVICES_CLOUDSYNC:
-#ifdef MOZ_SERVICES_CLOUDSYNC
- true,
-#else
- false,
-#endif
-
MOZ_UPDATER:
#ifdef MOZ_UPDATER
true,
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index e0acdb19ef..8f66417c1a 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -151,8 +151,7 @@ for var in ('ANDROID_PACKAGE_NAME',
for var in ('MOZ_TOOLKIT_SEARCH',
'MOZ_SYSTEM_NSS',
'MOZ_UPDATER',
- 'MOZ_SWITCHBOARD',
- 'MOZ_SERVICES_CLOUDSYNC'):
+ 'MOZ_SWITCHBOARD'):
if CONFIG[var]:
DEFINES[var] = True