Studio/AndroidIDE
5
0
Fork 0
mirror of https://gitee.com/zhangsken/AndroidIDE.git synced 2026-10-16 07:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Environment.SYSROOT to PREFIX

Browse Source
This commit is contained in:
Akash Yadav
2022-06-09 22:25:27 +05:30
parent 88a009e8a5
commit 4c517d2558
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/itsaky/androidide/TerminalActivity.java
+4 -4
View File
@@ -20,7 +20,7 @@ package com.itsaky.androidide;
import static com.itsaky.androidide.utils.Environment.BIN_DIR;
import static com.itsaky.androidide.utils.Environment.HOME;
import static com.itsaky.androidide.utils.Environment.LOGIN_SHELL;
import static com.itsaky.androidide.utils.Environment.SYSROOT;
import static com.itsaky.androidide.utils.Environment.PREFIX;
import static com.itsaky.androidide.utils.Environment.getEnvironment;
import android.os.Bundle;
@@ -89,8 +89,8 @@ public class TerminalActivity extends StudioActivity {
final var bash = new File(BIN_DIR, "bash");
final var useSystemShell =
getApp().getPrefManager().getBoolean(PreferenceManager.KEY_TERMINAL_USE_SYSTEM_SHELL);
if ((SYSROOT.exists()
&& SYSROOT.isDirectory()
if ((PREFIX.exists()
&& PREFIX.isDirectory()
&& bash.exists()
&& bash.isFile()
&& bash.canExecute())
@@ -241,7 +241,7 @@ public class TerminalActivity extends StudioActivity {
);
try {
final var file = new File(SYSROOT, "etc/apt/sources.list");
final var file = new File(PREFIX, "etc/apt/sources.list");
final var out = new FileOutputStream(file);
out.write(SOURCES_LIST_CONTENT);
out.flush();
common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java
+3 -3
View File
@@ -17,7 +17,7 @@
package com.itsaky.androidide.utils;
import static com.itsaky.androidide.utils.Environment.SYSROOT;
import static com.itsaky.androidide.utils.Environment.PREFIX;
import android.content.Context;
import android.system.ErrnoException;
@@ -89,7 +89,7 @@ public class BootstrapInstaller {
throw new CompletionException(new InstallationException(err));
}
String oldPath = parts[0];
String newPath = SYSROOT.getAbsolutePath() + "/" + parts[1];
String newPath = PREFIX.getAbsolutePath() + "/" + parts[1];
symlinks.add(Pair.create(oldPath, newPath));
final var parentFile = new File(newPath).getParentFile();
@@ -101,7 +101,7 @@ public class BootstrapInstaller {
}
} else {
String zipEntryName = entry.getName();
File targetFile = new File(SYSROOT, zipEntryName);
File targetFile = new File(PREFIX, zipEntryName);
boolean isDirectory = entry.isDirectory();
final var ___ = isDirectory ? targetFile : targetFile.getParentFile();
common/src/main/java/com/itsaky/androidide/utils/Environment.java
+9 -9
View File
@@ -46,7 +46,7 @@ public final class Environment {
private static final ILogger LOG = ILogger.newInstance("Environment");
private static final List<String> blacklist = new ArrayList<>();
public static File ROOT;
public static File SYSROOT;
public static File PREFIX;
public static File HOME;
public static File ANDROIDIDE_HOME;
public static File JAVA_HOME;
@@ -80,19 +80,19 @@ public final class Environment {
public static void init() {
final BaseApplication app = BaseApplication.getBaseInstance();
ROOT = app.getIDEDataDir();
SYSROOT = mkdirIfNotExits(new File(app.getIDEDataDir(), "usr"));
PREFIX = mkdirIfNotExits(new File(app.getIDEDataDir(), "usr"));
HOME = mkdirIfNotExits(app.getRootDir());
ANDROIDIDE_HOME = mkdirIfNotExits(new File(HOME, ".androidide"));
TMP_DIR = mkdirIfNotExits(new File(SYSROOT, "tmp"));
BIN_DIR = mkdirIfNotExits(new File(SYSROOT, "bin"));
LIB_DIR = mkdirIfNotExits(new File(SYSROOT, "lib"));
TMP_DIR = mkdirIfNotExits(new File(PREFIX, "tmp"));
BIN_DIR = mkdirIfNotExits(new File(PREFIX, "bin"));
LIB_DIR = mkdirIfNotExits(new File(PREFIX, "lib"));
PROJECTS_DIR = mkdirIfNotExits(new File(FileUtil.getExternalStorageDir(), PROJECTS_FOLDER));
COMPILER_MODULE = mkdirIfNotExits(new File(ANDROIDIDE_HOME, "compiler-module"));
TOOLING_API_JAR =
new File(mkdirIfNotExits(new File(ANDROIDIDE_HOME, "tooling-api")), "tooling-api-all.jar");
AAPT2 = new File(ANDROIDIDE_HOME, "aapt2");
IDE_PROPS_FILE = new File(SYSROOT, "etc/ide-environment.properties");
IDE_PROPS_FILE = new File(PREFIX, "etc/ide-environment.properties");
LIB_HOOK = new File(LIB_DIR, "libhook.so");
LIB_HOOK2 = new File(LIB_DIR, "libhook2.so");
PROJECT_DATA_FILE = new File(TMP_DIR, "ide_project");
@@ -154,7 +154,7 @@ public final class Environment {
value = value.replace("$HOME", HOME.getAbsolutePath());
}
if (value.contains("$SYSROOT")) {
value = value.replace("$SYSROOT", SYSROOT.getAbsolutePath());
value = value.replace("$SYSROOT", PREFIX.getAbsolutePath());
}
if (value.contains("$PATH")) {
value = value.replace("$PATH", createPath());
@@ -174,7 +174,7 @@ public final class Environment {
path += String.format("%s/bin", JAVA_HOME.getAbsolutePath());
path += String.format(":%s/cmdline-tools/latest/bin", ANDROID_HOME.getAbsolutePath());
path += String.format(":%s/cmake/bin", ANDROID_HOME.getAbsolutePath());
path += String.format(":%s/bin", SYSROOT.getAbsolutePath());
path += String.format(":%s/bin", PREFIX.getAbsolutePath());
path += String.format(":%s", System.getenv("PATH"));
return path;
}
@@ -200,7 +200,7 @@ public final class Environment {
ENV_VARS.put("LANG", "en_US.UTF-8");
ENV_VARS.put("LC_ALL", "en_US.UTF-8");
ENV_VARS.put("SYSROOT", SYSROOT.getAbsolutePath());
ENV_VARS.put("SYSROOT", PREFIX.getAbsolutePath());
ENV_VARS.put("BUSYBOX", BUSYBOX.getAbsolutePath());
ENV_VARS.put("SHELL", SHELL.getAbsolutePath());