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

Commit 0fcd10fc authored by Calin Juravle's avatar Calin Juravle Committed by Android Git Automerger
Browse files

am d911a3bd: am 0a63f754: am 729fc678: Merge "Update the handling of the... 

am d911a3bd: am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev

* commit 'd911a3bd0f95721e0fcf26f61cfa517bbee359b9':
  Update the handling of the native bridge property.
parents e4c57cd7 f924c027

core/jni/AndroidRuntime.cpp

+10 −2
Original line number Diff line number Diff line
@@ -879,9 +879,17 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        parseRuntimeOption("dalvik.vm.profile.max-stack-depth",

                           profileMaxStackDepth,

                           "-Xprofile-max-stack-depth:");

    }



    parseRuntimeOption("ro.dalvik.vm.native.bridge", nativeBridgeLibrary, "-XX:NativeBridge=");

        // Native bridge library. "0" means that native bridge is disabled.

        property_get("ro.dalvik.vm.native.bridge", propBuf, "");

        if (propBuf[0] == '\0') {

            ALOGW("ro.dalvik.vm.native.bridge is not expected to be empty");

        } else if (strcmp(propBuf, "0") != 0) {

            snprintf(nativeBridgeLibrary, sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX,

                     "-XX:NativeBridge=%s", propBuf);

            addOption(nativeBridgeLibrary);

        }

    }



    initArgs.version = JNI_VERSION_1_4;

    initArgs.options = mOptions.editArray();