Merge "Check ANDROID_I18N_ROOT when starting the runtime" am: 4a09c691bf am: dba23bbec1

am: 7ec076c542

Change-Id: I16c52f3d974a3c9ff96fffdb1feba281b36a7873
This commit is contained in:
vichang
2019-09-25 05:40:48 -07:00
committed by android-build-merger

View File

@@ -1169,6 +1169,12 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options
return;
}
const char* i18nRootDir = getenv("ANDROID_I18N_ROOT");
if (i18nRootDir == NULL) {
LOG_FATAL("No runtime directory specified with ANDROID_I18N_ROOT environment variable.");
return;
}
const char* tzdataRootDir = getenv("ANDROID_TZDATA_ROOT");
if (tzdataRootDir == NULL) {
LOG_FATAL("No tz data directory specified with ANDROID_TZDATA_ROOT environment variable.");