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

Commit e26a8733 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Pass core platform API policy property to ART" am: e4f9b348... 

Merge "Merge "Pass core platform API policy property to ART" am: e4f9b348 am: 14432304" into qt-dev-plus-aosp
parents f70c4777 34bf2fc0

core/jni/AndroidRuntime.cpp

+11 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:")-1 + PROPERTY_VALUE_MAX];

    char nativeBridgeLibrary[sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX];

    char cpuAbiListBuf[sizeof("--cpu-abilist=") + PROPERTY_VALUE_MAX];

    char corePlatformApiPolicyBuf[sizeof("-Xcore-platform-api-policy:") + PROPERTY_VALUE_MAX];

    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    std::string fingerprintBuf;
@@ -1024,6 +1025,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
        addOption("--generate-mini-debug-info");

    }



    // If set, the property below can be used to enable core platform API violation reporting.

    property_get("persist.debug.dalvik.vm.core_platform_api_policy", propBuf, "");

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

      snprintf(corePlatformApiPolicyBuf,

               sizeof(corePlatformApiPolicyBuf),

               "-Xcore-platform-api-policy:%s",

               propBuf);

      addOption(corePlatformApiPolicyBuf);

    }



    /*

     * Retrieve the build fingerprint and provide it to the runtime. That way, ANR dumps will

     * contain the fingerprint and can be parsed.