From e3fddf4ab2fd0edb13bda33a43e706d3b8c6c7ce Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 23 Jul 2024 22:05:38 +0000
Subject: [PATCH] Bug 1908833 - Remove ZLIB_IN_MOZGLUE.
 r=firefox-build-system-reviewers,ahochheiden

It's not used on Android anymore, which was the last remaining thing
that would set it.

Differential Revision: https://phabricator.services.mozilla.com/D217349
---
 config/external/zlib/moz.build |  7 -------
 modules/zlib/src/moz.build     |  7 ++-----
 modules/zlib/src/mozzconf.h    |  6 ------
 moz.configure                  | 10 ----------
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/config/external/zlib/moz.build b/config/external/zlib/moz.build
index 755400fa7f86..c2b9847e6bbd 100644
--- a/config/external/zlib/moz.build
+++ b/config/external/zlib/moz.build
@@ -9,13 +9,6 @@ Library("zlib")
 if CONFIG["MOZ_SYSTEM_ZLIB"]:
     OS_LIBS += CONFIG["MOZ_ZLIB_LIBS"]
 else:
-    if CONFIG["ZLIB_IN_MOZGLUE"]:
-        # Can't do this until mozglue is handled by moz.build instead of
-        # config/rules.mk.
-        # USE_LIBS += [
-        #     'mozglue'
-        # ]
-        pass
     DIRS += [
         "../../../modules/zlib",
     ]
diff --git a/modules/zlib/src/moz.build b/modules/zlib/src/moz.build
index 87c33d4936c4..99c2813ac1d7 100644
--- a/modules/zlib/src/moz.build
+++ b/modules/zlib/src/moz.build
@@ -10,11 +10,8 @@ EXPORTS += [
     'zlib.h',
 ]
 
-if CONFIG['ZLIB_IN_MOZGLUE']:
-    FINAL_LIBRARY = 'mozglue'
-else:
-    # The final library is in config/external/zlib
-    FINAL_LIBRARY = 'zlib'
+# The final library is in config/external/zlib
+FINAL_LIBRARY = 'zlib'
 
 # These files can't be unified because zlib's headers don't use include guards.
 SOURCES += [
diff --git a/modules/zlib/src/mozzconf.h b/modules/zlib/src/mozzconf.h
index e1a8c28027ca..ec947f07a33a 100644
--- a/modules/zlib/src/mozzconf.h
+++ b/modules/zlib/src/mozzconf.h
@@ -6,12 +6,6 @@
 #ifndef MOZZCONF_H
 #define MOZZCONF_H
 
-#if defined(ZLIB_IN_MOZGLUE)
-#include "mozilla/Types.h"
-
-#define ZEXTERN MFBT_API
-#endif
-
 /* Exported Symbols */
 #define zlibVersion MOZ_Z_zlibVersion
 #define deflate MOZ_Z_deflate
diff --git a/moz.configure b/moz.configure
index e116a0724298..0e29fc9e03a5 100755
--- a/moz.configure
+++ b/moz.configure
@@ -912,16 +912,6 @@ pkg_check_modules("MOZ_ZLIB", "zlib >= 1.2.3", when="--with-system-zlib")
 set_config("MOZ_SYSTEM_ZLIB", True, when="--with-system-zlib")
 
 
-@depends(with_system_zlib_option, target.os)
-def zlib_in_mozglue(system_zlib, os):
-    if not system_zlib and os == "Android":
-        return True
-
-
-set_config("ZLIB_IN_MOZGLUE", zlib_in_mozglue)
-set_define("ZLIB_IN_MOZGLUE", zlib_in_mozglue)
-
-
 with only_when(cross_compiling):
     option(
         env="JS_BINARY",