summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2019-09-24 17:40:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-09-24 17:40:05 +0000
commit80fd44500cb4c72b504512b45cac8742ccff7db5 (patch)
treef832c2948cae6fe0d3c2a2c8c2851411c0542378
parenta11beeca12748fe0af659f5d8c1247009ea7fd4c (diff)
parent5bbffbc82735266ff9bb9f961817574d0fda37d1 (diff)
Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change."
-rw-r--r--core/jni/AndroidRuntime.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 7df621daea13..92ac95d4cf07 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1163,9 +1163,9 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options
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.");
+ const char* artRootDir = getenv("ANDROID_ART_ROOT");
+ if (artRootDir == NULL) {
+ LOG_FATAL("No ART directory specified with ANDROID_ART_ROOT environment variable.");
return;
}