From 867252fb3ba1250fa5fd975e64bdb471ab5bfa6b Mon Sep 17 00:00:00 2001
From: JingMatrix <jingmatrix@gmail.com>
Date: Thu, 5 Dec 2024 19:26:35 +0100
Subject: [PATCH] Fix LD_LIBRARY_PATH for dex2oat32

Close #107 as fixed.
---
 dex2oat/src/main/cpp/dex2oat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dex2oat/src/main/cpp/dex2oat.c b/dex2oat/src/main/cpp/dex2oat.c
index 8db3c79a..73c526d3 100644
--- a/dex2oat/src/main/cpp/dex2oat.c
+++ b/dex2oat/src/main/cpp/dex2oat.c
@@ -114,9 +114,13 @@ int main(int argc, char **argv) {
     new_argv[argc + 1] = NULL;
 
     if (getenv("LD_LIBRARY_PATH") == NULL) {
+#if defined(__LP64__)
         char const *libenv =
-            "LD_LIBRARY_PATH=/apex/com.android.art/lib64:/apex/com.android.art/lib"
-            ":/apex/com.android.os.statsd/lib64:/apex/com.android.os.statsd/lib";
+            "LD_LIBRARY_PATH=/apex/com.android.art/lib64:/apex/com.android.os.statsd/lib64";
+#else
+        char const *libenv =
+            "LD_LIBRARY_PATH=/apex/com.android.art/lib:/apex/com.android.os.statsd/lib";
+#endif
         putenv((char *)libenv);
     }
     fexecve(stock_fd, (char **)new_argv, environ);