Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make ANDROID_RUNTIME_ROOT a required env variable" am: 6dc466fd3a

Browse Source 
am: 84cbaf603e

Change-Id: I8fe51f82861ea2397b335efdbc4605fbd1e9b46a
This commit is contained in:
Neil Fuller
2018-12-04 05:13:57 -08:00
committed by android-build-merger
parent 110abbf49a 84cbaf603e
commit beb24a9764
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/AndroidRuntime.cpp
View File

@@ -1052,12 +1052,18 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options
if (rootDir == NULL) { if (rootDir == NULL) {
rootDir = "/system"; rootDir = "/system";
if (!hasDir("/system")) { if (!hasDir("/system")) {
LOG_FATAL("No root directory specified, and /android does not exist."); LOG_FATAL("No root directory specified, and /system does not exist.");
return; return;
} }
setenv("ANDROID_ROOT", rootDir, 1); setenv("ANDROID_ROOT", rootDir, 1);
} }
const char* runtimeRootDir = getenv("ANDROID_RUNTIME_ROOT");
if (runtimeRootDir == NULL) {
LOG_FATAL("No runtime directory specified with ANDROID_RUNTIME_ROOT environment variable.");
return;
}
//const char* kernelHack = getenv("LD_ASSUME_KERNEL"); //const char* kernelHack = getenv("LD_ASSUME_KERNEL");
//ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack); //ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);