From f5322c318c7890625a6aa45186e23b2fc383d21d Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 22 Apr 2024 13:31:57 +0800 Subject: [PATCH] Fix load order of certain Android shared libraries * java/org/gnu/emacs/EmacsNative.java (libraryDeps): Move dependencies of selinux and gnutls before their respective dependents. (cherry picked from commit 7d6f4d90856000df805269fb620adb8bd3760717) --- java/org/gnu/emacs/EmacsNative.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java index 24440bd5953..567242f2ec3 100644 --- a/java/org/gnu/emacs/EmacsNative.java +++ b/java/org/gnu/emacs/EmacsNative.java @@ -327,20 +327,20 @@ public final class EmacsNative loaded from Java. Every time you add a new shared library dependency to Emacs, - please add it here as well. */ + please insert it here as well, before other shared libraries of + which it might be a dependency. */ libraryDeps = new String[] { "c++_shared", "gnustl_shared", "stlport_shared", "gabi++_shared", - "png_emacs", "selinux_emacs", - "crypto_emacs", "pcre_emacs", + "png_emacs", "pcre_emacs", + "selinux_emacs", "crypto_emacs", "packagelistparser_emacs", - "gnutls_emacs", "gmp_emacs", - "nettle_emacs", "p11-kit_emacs", - "tasn1_emacs", "hogweed_emacs", - "jpeg_emacs", - "tiff_emacs", "xml2_emacs", - "icuuc_emacs", "harfbuzz_emacs", - "tree-sitter_emacs", }; + "gmp_emacs", "nettle_emacs", + "p11-kit_emacs", "tasn1_emacs", + "hogweed_emacs", "gnutls_emacs", + "jpeg_emacs", "tiff_emacs", + "icuuc_emacs", "xml2_emacs", + "harfbuzz_emacs", "tree-sitter_emacs", }; for (String dependency : libraryDeps) { -- 2.39.5