Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 085fc261 authored by vichang's avatar vichang Committed by android-build-merger
Browse files

Merge "Check ANDROID_I18N_ROOT when starting the runtime" am: 4a09c691 am:... 

Merge "Check ANDROID_I18N_ROOT when starting the runtime" am: 4a09c691 am: dba23bbe am: 7ec076c5
am: f3161212

Change-Id: Id1898bc481e19a5a4697ba5b851431b6a395a6aa
parents a56baba8 f3161212

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -1169,6 +1169,12 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options 
        return;

        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");

    const char* tzdataRootDir = getenv("ANDROID_TZDATA_ROOT");

    if (tzdataRootDir == NULL) {

    if (tzdataRootDir == NULL) {

        LOG_FATAL("No tz data directory specified with ANDROID_TZDATA_ROOT environment variable.");

        LOG_FATAL("No tz data directory specified with ANDROID_TZDATA_ROOT environment variable.");