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

Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change."

Browse Source 
am: 80fd44500c

Change-Id: Ib9d3e3b8c0159d04e28c3501ef214779dc4a1262
This commit is contained in:
Martin Stjernholm
2019-09-24 10:52:54 -07:00
committed by android-build-merger
parent af1f91a133 80fd44500c
commit 59bcfb47fe
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/AndroidRuntime.cpp
View File

@@ -1163,9 +1163,9 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options
setenv("ANDROID_ROOT", rootDir, 1); setenv("ANDROID_ROOT", rootDir, 1);
} }
const char* runtimeRootDir = getenv("ANDROID_RUNTIME_ROOT"); const char* artRootDir = getenv("ANDROID_ART_ROOT");
if (runtimeRootDir == NULL) { if (artRootDir == NULL) {
LOG_FATAL("No runtime directory specified with ANDROID_RUNTIME_ROOT environment variable."); LOG_FATAL("No ART directory specified with ANDROID_ART_ROOT environment variable.");
return; return;
} }