From c608eb30ecc4107e827f51465ab8208fe69f34b7 Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Fri, 10 Jun 2022 07:47:25 +0530
Subject: [PATCH] Do not use libhook library Updated ideenv

---
 .idea/codeStyles/Project.xml                  |   2 --
 app/src/main/assets/data/common/ideenv        |   9 ++++++---
 .../test/test-home/.androidide/init/model.jar | Bin 55161 -> 55161 bytes
 .../androidide/managers/ToolsManager.java     |  14 +++++++++++++-
 .../itsaky/androidide/utils/Environment.java  |  13 ++++++-------
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 38c811071..2175dbb2f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,8 +5,6 @@
       <option name="GENERATE_FINAL_PARAMETERS" value="true" />
       <option name="SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT" value="true" />
       <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
-      <option name="USE_FQ_CLASS_NAMES" value="true" />
-      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
diff --git a/app/src/main/assets/data/common/ideenv b/app/src/main/assets/data/common/ideenv
index 3df54e52d..e0b63b459 100644
--- a/app/src/main/assets/data/common/ideenv
+++ b/app/src/main/assets/data/common/ideenv
@@ -2,7 +2,7 @@
 set -eu
 
 print_help() {
-	echo "Utility command to show/edit AndroidIDE Envrionment Variables"
+	echo "Utility command to show/edit AndroidIDE Environment Variables"
 	echo "Usage: ideenv [options]"
 	echo ""
 	echo "	-s 	Show the environment variables"
@@ -12,12 +12,15 @@ print_help() {
 }
 
 
-PROPS=@TERMUX_PREFIX@/etc/ide-environment.properties
-while getopts ":se" option; do
+PROPS=@PREFIX@/etc/ide-environment.properties
+while getopts ":she" option; do
 	case $option in
 		s) ## Simply print the contents of the file
 		   cat $PROPS
 		   exit;;
+		h) ## Show the help
+		   print_help
+		   exit;;
 		*) ## Open the file in nano editor
 		   echo "Opening $PROPS file with nano editor..."
 		   nano $PROPS
diff --git a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar
index 1f3f9b9809b5e50e9e562a76a6fd7f888714eec7..d4c9447b827108bb9d60135b84976c858e8260c5 100644
GIT binary patch
delta 31
ncmeylj``<0W}X0VW)?061`ZAeQ`?O^nWvacZ8w*nV&Vk=mvRX9

delta 22
ecmeylj``<0=83<hHcCaGnmqTkz~<IdUw8nF01Nm4

diff --git a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
index 0abfd6a2c..1420d7ca5 100755
--- a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
+++ b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
@@ -56,9 +56,10 @@ public class ToolsManager {
               copyBusyboxIfNeeded();
               extractLogsenderIfNeeded();
               extractAapt2();
-              extractLibHooks();
+              //              extractLibHooks();
               extractGradlePlugin();
               extractToolingApi();
+              extractIdeEnv();
               writeInitScript();
             })
         .whenComplete(
@@ -73,6 +74,17 @@ public class ToolsManager {
             });
   }
 
+  private static void extractIdeEnv() {
+    final var file = new File(Environment.BIN_DIR, "ideenv");
+    if (file.exists()) {
+      file.delete();
+    }
+
+    var contents = ResourceUtils.readAssets2String(getCommonAsset("ideenv"));
+    contents = contents.replace("@PREFIX@", Environment.PREFIX.getAbsolutePath());
+    FileIOUtils.writeFileFromString(file, contents);
+  }
+
   private static void copyBusyboxIfNeeded() {
     File exec = Environment.BUSYBOX;
     if (exec.exists()) return;
diff --git a/common/src/main/java/com/itsaky/androidide/utils/Environment.java b/common/src/main/java/com/itsaky/androidide/utils/Environment.java
index bb5df4bfc..8f6d67c78 100755
--- a/common/src/main/java/com/itsaky/androidide/utils/Environment.java
+++ b/common/src/main/java/com/itsaky/androidide/utils/Environment.java
@@ -17,7 +17,6 @@
 package com.itsaky.androidide.utils;
 
 import android.annotation.SuppressLint;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 
@@ -218,12 +217,12 @@ public final class Environment {
     ld += LIB_DIR.getAbsolutePath();
     ENV_VARS.put("LD_LIBRARY_PATH", ld);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-        && BaseApplication.isAarch64()
-        && LIB_HOOK.exists()) {
-      // Required for JDK 11
-      ENV_VARS.put("LD_PRELOAD", LIB_HOOK.getAbsolutePath());
-    }
+    //    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+    //        && BaseApplication.isAarch64()
+    //        && LIB_HOOK.exists()) {
+    //       Required for JDK 11
+    //      ENV_VARS.put("LD_PRELOAD", LIB_HOOK.getAbsolutePath());
+    //    }
 
     addToEnvIfPresent(ENV_VARS, "ANDROID_ART_ROOT");
     addToEnvIfPresent(ENV_VARS, "DEX2OATBOOTCLASSPATH");