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

Commit 22e57478 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module... 

Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change." am: 80fd4450
am: 59bcfb47

Change-Id: I3c9c19cf8fb05a21b039212aeaa01fe4ccaab972
parents 3343814a 59bcfb47

core/jni/AndroidRuntime.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1163,9 +1163,9 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options 
        setenv("ANDROID_ROOT", rootDir, 1);

    }



    const char* runtimeRootDir = getenv("ANDROID_RUNTIME_ROOT");

    if (runtimeRootDir == NULL) {

        LOG_FATAL("No runtime directory specified with ANDROID_RUNTIME_ROOT environment variable.");

    const char* artRootDir = getenv("ANDROID_ART_ROOT");

    if (artRootDir == NULL) {

        LOG_FATAL("No ART directory specified with ANDROID_ART_ROOT environment variable.");

        return;

    }