Merge "Merge "Require the ANDROID_TZDATA_ROOT env var" am: f6c4aa1f67 am:... (2c83d371) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -1126,6 +1126,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);