Merge "Require the ANDROID_TZDATA_ROOT env var" am: f6c4aa1f67

am: 20fd6bdc01 Change-Id: Id3356648249cb0ca9bb520e56e401c8e63327e58
2019-03-21 11:23:43 -07:00
parent 1cf81ee892 20fd6bdc01
commit 1f36ba9bef
1 changed files with 6 additions and 0 deletions
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -1112,6 +1112,12 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options
        return;
    }

+    const char* tzdataRootDir = getenv("ANDROID_TZDATA_ROOT");
+    if (tzdataRootDir == NULL) {
+        LOG_FATAL("No tz data directory specified with ANDROID_TZDATA_ROOT environment variable.");
+        return;
+    }
+
    //const char* kernelHack = getenv("LD_ASSUME_KERNEL");
    //ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);