diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-05 06:02:02 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-05 06:02:02 -0400 |
| commit | 5593323410b2373ef7c4abcc4826d85e573a13fc (patch) | |
| tree | a3d53a8160cdd50cf8eef491310af5c73ae3fe3b /browser | |
| parent | 86f601589431c500a1a299000a3eac34d5b0247d (diff) | |
| download | uxp-5593323410b2373ef7c4abcc4826d85e573a13fc.tar.gz | |
Take the following project_flags out of moz.configure: and put them back into old-configure
MOZ_PLACES
MOZ_SOCIAL
MOZ_SERVICES_HEALTHREPORT
MOZ_SERVICES_SYNC
MOZ_SERVICES_CLOUDSYNC
Diffstat (limited to 'browser')
| -rwxr-xr-x | browser/confvars.sh | 3 | ||||
| -rw-r--r-- | browser/moz.configure | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/browser/confvars.sh b/browser/confvars.sh index 8cdd6e1f38..03b4cea972 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -56,6 +56,9 @@ MOZ_JSDOWNLOADS=1 MOZ_WEBRTC=1 MOZ_WEBEXTENSIONS=1 MOZ_DEVTOOLS=1 +MOZ_SERVICES_COMMON=1 +MOZ_SERVICES_SYNC=1 +MOZ_SERVICES_HEALTHREPORT=1 # Disable checking that add-ons are signed by the trusted root MOZ_ADDON_SIGNING=0 diff --git a/browser/moz.configure b/browser/moz.configure index fba4603be0..d5e7dba11a 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -4,9 +4,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -imply_option('MOZ_PLACES', True) -imply_option('MOZ_SERVICES_HEALTHREPORT', True) -imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_SERVICES_CLOUDSYNC', True) - include('../toolkit/moz.configure') |