Bug 1669633 - Only use MOZ_ZLIB_LIBS in config/external/zlib/moz.build. r=firefox-build-system-reviewers,rstewart

This simplifies how js gets zlib by simply using the zlib Library
defined in config/external/zlib instead of manually adding MOZ_ZLIB_LIBS
that it needs to inherit somehow correctly from the top-level configure.

The use in browser/app was redundant with mozglue depending on zlib
already.

Differential Revision: https://phabricator.services.mozilla.com/D92720

browser/app/moz.build

@@ -128,9 +128,6 @@ if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 'gcc'):
 
 DisableStlWrapping()
 
-if CONFIG['MOZ_LINKER']:
-    OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
-
 if CONFIG['HAVE_CLOCK_MONOTONIC']:
     OS_LIBS += CONFIG['REALTIME_LIBS']
 

js/src/js-standalone.mozbuild

@@ -8,7 +8,6 @@
 # Gecko build performs equivalents elsewhere in its configuration.
 
 USE_LIBS += [
-    'jsrust'
+    'jsrust',
+    'zlib',
 ]
-
-OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']

js/sub.configure

@@ -53,9 +53,6 @@ def js_subconfigure(host, target, build_env, js_configure_args, mozconfig,
 
     options.append('--prefix=%s/dist' % build_env.topobjdir)
 
-    if substs.get('ZLIB_IN_MOZGLUE'):
-        substs['MOZ_ZLIB_LIBS'] = ''
-
     environ['MOZILLA_CENTRAL_PATH'] = build_env.topsrcdir
     if 'MOZ_BUILD_APP' in environ:
         del environ['MOZ_BUILD_APP']