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

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

Merge "Make ANDROID_RUNTIME_ROOT a required env variable" am: 6dc466fd 

am: 84cbaf60

Change-Id: I8fe51f82861ea2397b335efdbc4605fbd1e9b46a
parents 110abbf4 84cbaf60

core/jni/AndroidRuntime.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1052,12 +1052,18 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options 
    if (rootDir == NULL) {

        rootDir = "/system";

        if (!hasDir("/system")) {

            LOG_FATAL("No root directory specified, and /android does not exist.");

            LOG_FATAL("No root directory specified, and /system does not exist.");

            return;

        }

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

        return;

    }



    //const char* kernelHack = getenv("LD_ASSUME_KERNEL");

    //ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);