aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorPo Lu2024-04-22 13:31:57 +0800
committerPo Lu2024-04-22 13:32:34 +0800
commit7d6f4d90856000df805269fb620adb8bd3760717 (patch)
treedaedf43022ea637e9f0dc356f64ec71e5283d78a /java
parentac2a4f61bdd0dc3a71a544d25de7cb36d37f44f9 (diff)
downloademacs-7d6f4d90856000df805269fb620adb8bd3760717.tar.gz
emacs-7d6f4d90856000df805269fb620adb8bd3760717.zip
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.
Diffstat (limited to 'java')
-rw-r--r--java/org/gnu/emacs/EmacsNative.java20
1 files 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
327 loaded from Java. 327 loaded from Java.
328 328
329 Every time you add a new shared library dependency to Emacs, 329 Every time you add a new shared library dependency to Emacs,
330 please add it here as well. */ 330 please insert it here as well, before other shared libraries of
331 which it might be a dependency. */
331 332
332 libraryDeps = new String[] { "c++_shared", "gnustl_shared", 333 libraryDeps = new String[] { "c++_shared", "gnustl_shared",
333 "stlport_shared", "gabi++_shared", 334 "stlport_shared", "gabi++_shared",
334 "png_emacs", "selinux_emacs", 335 "png_emacs", "pcre_emacs",
335 "crypto_emacs", "pcre_emacs", 336 "selinux_emacs", "crypto_emacs",
336 "packagelistparser_emacs", 337 "packagelistparser_emacs",
337 "gnutls_emacs", "gmp_emacs", 338 "gmp_emacs", "nettle_emacs",
338 "nettle_emacs", "p11-kit_emacs", 339 "p11-kit_emacs", "tasn1_emacs",
339 "tasn1_emacs", "hogweed_emacs", 340 "hogweed_emacs", "gnutls_emacs",
340 "jpeg_emacs", 341 "jpeg_emacs", "tiff_emacs",
341 "tiff_emacs", "xml2_emacs", 342 "icuuc_emacs", "xml2_emacs",
342 "icuuc_emacs", "harfbuzz_emacs", 343 "harfbuzz_emacs", "tree-sitter_emacs", };
343 "tree-sitter_emacs", };
344 344
345 for (String dependency : libraryDeps) 345 for (String dependency : libraryDeps)
346 { 346 {