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

Commit 1f36ba9b authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Require the ANDROID_TZDATA_ROOT env var" am: f6c4aa1f 

am: 20fd6bdc

Change-Id: Id3356648249cb0ca9bb520e56e401c8e63327e58
parents 1cf81ee8 20fd6bdc

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