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

Commit 20fd6bdc 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

Change-Id: Ic307cf7c3e648f37170834c1b265761de4d77b6b
parents ea992811 f6c4aa1f

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