Commit b99050d8 authored Mar 13, 2019 by Neil Fuller

Require the ANDROID_TZDATA_ROOT env var

The ANDROID_TZDATA_ROOT serves a similar purpose to the
ANDROID_RUNTIME_ROOT: it determines the location that can be used to
find time zone data files. Since the Android Core Library will soon
require it to be set it makes sense to check it alongside the
ANDROID_RUNTIME_ROOT variable.

Bug: 128422035
Test: build / boot
Change-Id: Ie4860f60760905a06a744bd48fd773d0a4e8cf6d

parent bee0cbe5

core/jni/AndroidRuntime.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);