commit 3ce4ccec69f5649693b79c757795ec415456788e
author Neil Fuller <nfuller@google.com> Fri Nov 23 19:00:32 2018 +0000
committer Neil Fuller <nfuller@google.com> Thu Nov 29 19:28:02 2018 +0000
tree c866e26c9870f696110678b8a5cad821f98f6356
parent 787e1ce12eaa35cd6a02b60bf3b3589605d9a26d

Make ANDROID_RUNTIME_ROOT a required env variable

Make ANDROID_RUNTIME_ROOT a required environment variable
for AndroidRuntime.cpp.

Bug: 119935277
Test: build / treehugger
Change-Id: I1098b4d7de8a8642ca5f431ec56a3f086f22b44f

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index f7f10c4..b94ac9c 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1052,12 +1052,18 @@
     if (rootDir == NULL) {
         rootDir = "/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;
         }
         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");
     //ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);