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

Commit d71de10c authored by Calin Juravle's avatar Calin Juravle
Browse files

Update the handling of the native bridge property. 

ro.dalvik.vm.native.bridge is expected to be always be set. A value of
"0" means that the native bridge is disabled and that no value should be
passed to the runtime.

Bug: 17104449

(cherry picked from commit 831bd75b2bbc126f02578a967e925271b9cac6d3)

Change-Id: Ib483ac8e96bdc66af2725815807d4deb36fb36ab
parent e8d2ffd7

core/jni/AndroidRuntime.cpp

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

        parseRuntimeOption("dalvik.vm.profile.max-stack-depth",

                           profileMaxStackDepth,

                           profileMaxStackDepth,

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

                           "-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.version = JNI_VERSION_1_4;

    initArgs.options = mOptions.editArray();

    initArgs.options = mOptions.editArray();