From c1f6c995a0445d75f0a715e598437460026f4e45 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Tue, 15 Mar 2022 20:23:31 +0800
Subject: [PATCH] Cache native libraries with architecture-dependent paths

---
 .../main/java/com/sun/glass/utils/NativeLibLoader.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java b/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java
index 5ab1d544009..4320354555b 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -235,8 +235,9 @@ private static boolean installLibraryFromResource(String libraryName, List<Strin
     private static String cacheLibrary(InputStream is, String name, Class caller) throws IOException {
         String jfxVersion = System.getProperty("javafx.runtime.version", "versionless");
         String userCache = System.getProperty("javafx.cachedir", "");
+        String arch = System.getProperty("os.arch");
         if (userCache.isEmpty()) {
-            userCache = System.getProperty("user.home") + "/.openjfx/cache/" + jfxVersion;
+            userCache = System.getProperty("user.home") + "/.openjfx/cache/" + jfxVersion + "/" + arch;
         }
         File cacheDir = new File(userCache);
         boolean cacheDirOk = true;
@@ -257,7 +258,8 @@ private static String cacheLibrary(InputStream is, String name, Class caller) th
         }
         if (!cacheDirOk) {
             String username = System.getProperty("user.name", "anonymous");
-            String tmpCache = System.getProperty("java.io.tmpdir") + "/.openjfx_" + username + "/cache/" + jfxVersion;
+            String tmpCache = System.getProperty("java.io.tmpdir") + "/.openjfx_" + username
+                    + "/cache/" + jfxVersion + "/" + arch;
             cacheDir = new File(tmpCache);
             if (cacheDir.exists()) {
                 if (!cacheDir.isDirectory()) {