am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime" (5470c169) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+102 −205

Original line number	Diff line number	Diff line
		@@ -525,8 +525,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		JavaVMInitArgs initArgs;
		char propBuf[PROPERTY_VALUE_MAX];
		char stackTraceFileBuf[sizeof("-Xstacktracefile:")-1 + PROPERTY_VALUE_MAX];
		char dexoptFlagsBuf[PROPERTY_VALUE_MAX];
		char enableAssertBuf[sizeof("-ea:")-1 + PROPERTY_VALUE_MAX];
		char jniOptsBuf[sizeof("-Xjniopts:")-1 + PROPERTY_VALUE_MAX];
		char heapstartsizeOptsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
		char heapsizeOptsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];
		@@ -536,8 +534,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];
		char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];
		char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];
		char jitcodecachesizeOptsBuf[sizeof("-Xjitcodecachesize:")-1 + PROPERTY_VALUE_MAX];
		char dalvikVmLibBuf[PROPERTY_VALUE_MAX];
		char dex2oatXmsImageFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
		char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];
		char dex2oatXmsFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
		@@ -566,8 +562,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		char langOption[sizeof("-Duser.language=") + 3];
		char regionOption[sizeof("-Duser.region=") + 3];
		char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:")-1 + PROPERTY_VALUE_MAX];
		char jitOpBuf[sizeof("-Xjitop:")-1 + PROPERTY_VALUE_MAX];
		char jitMethodBuf[sizeof("-Xjitmethod:")-1 + PROPERTY_VALUE_MAX];
		char nativeBridgeLibrary[sizeof("-XX:NativeBridge=") + PROPERTY_VALUE_MAX];

		bool checkJni = false;
		@@ -586,9 +580,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		/* extended JNI checking */
		addOption("-Xcheck:jni");

		/* set a cap on JNI global references */
		addOption("-Xjnigreflimit:2000");

		/* with -Xcheck:jni, this provides a JNI function call trace */
		//addOption("-verbose:jni");
		}
		@@ -604,30 +595,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)

		parseRuntimeOption("dalvik.vm.stack-trace-file", stackTraceFileBuf, "-Xstacktracefile:");

		property_get("dalvik.vm.check-dex-sum", propBuf, "");
		if (strcmp(propBuf, "true") == 0) {
		/* perform additional DEX checksum tests */
		addOption("-Xcheckdexsum");
		}

		property_get("log.redirect-stdio", propBuf, "");
		if (strcmp(propBuf, "true") == 0) {
		/* convert stdout/stderr to log messages */
		addOption("-Xlog-stdio");
		}

		strcpy(enableAssertBuf, "-ea:");
		property_get("dalvik.vm.enableassertions", enableAssertBuf+sizeof("-ea:")-1, "");
		if (enableAssertBuf[sizeof("-ea:")-1] != '\0') {
		/* accept "all" to mean "all classes and packages" */
		if (strcmp(enableAssertBuf+sizeof("-ea:")-1, "all") == 0)
		enableAssertBuf[3] = '\0'; // truncate to "-ea"
		ALOGI("Assertions enabled: '%s'\n", enableAssertBuf);
		addOption(enableAssertBuf);
		} else {
		ALOGV("Assertions disabled\n");
		}

		strcpy(jniOptsBuf, "-Xjniopts:");
		if (parseRuntimeOption("dalvik.vm.jniopts", jniOptsBuf, "-Xjniopts:")) {
		ALOGI("JNI options: '%s'\n", jniOptsBuf);
		@@ -654,14 +621,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		parseRuntimeOption("dalvik.vm.heapstartsize", heapstartsizeOptsBuf, "-Xms", "4m");
		parseRuntimeOption("dalvik.vm.heapsize", heapsizeOptsBuf, "-Xmx", "16m");

		// Increase the main thread's interpreter stack size for bug 6315322.
		addOption("-XX:mainThreadStackSize=24K");

		// Set the max jit code cache size. Note: size of 0 will disable the JIT.
		parseRuntimeOption("dalvik.vm.jit.codecachesize",
		jitcodecachesizeOptsBuf,
		"-Xjitcodecachesize:");

		parseRuntimeOption("dalvik.vm.heapgrowthlimit", heapgrowthlimitOptsBuf, "-XX:HeapGrowthLimit=");
		parseRuntimeOption("dalvik.vm.heapminfree", heapminfreeOptsBuf, "-XX:HeapMinFree=");
		parseRuntimeOption("dalvik.vm.heapmaxfree", heapmaxfreeOptsBuf, "-XX:HeapMaxFree=");
		@@ -677,53 +636,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		parseRuntimeOption("dalvik.vm.gctype", gctypeOptsBuf, "-Xgc:");
		parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");

		/*
		* Enable or disable dexopt features, such as bytecode verification and
		* calculation of register maps for precise GC.
		*/
		property_get("dalvik.vm.dexopt-flags", dexoptFlagsBuf, "");
		if (dexoptFlagsBuf[0] != '\0') {
		const char* opc;
		const char* val;

		opc = strstr(dexoptFlagsBuf, "v="); /* verification */
		if (opc != NULL) {
		switch (*(opc+2)) {
		case 'n': val = "-Xverify:none"; break;
		case 'r': val = "-Xverify:remote"; break;
		case 'a': val = "-Xverify:all"; break;
		default: val = NULL; break;
		}

		if (val != NULL) {
		addOption(val);
		}
		}

		opc = strstr(dexoptFlagsBuf, "o="); /* optimization */
		if (opc != NULL) {
		switch (*(opc+2)) {
		case 'n': val = "-Xdexopt:none"; break;
		case 'v': val = "-Xdexopt:verified"; break;
		case 'a': val = "-Xdexopt:all"; break;
		case 'f': val = "-Xdexopt:full"; break;
		default: val = NULL; break;
		}

		if (val != NULL) {
		addOption(val);
		}
		}

		opc = strstr(dexoptFlagsBuf, "m=y"); /* register map */
		if (opc != NULL) {
		addOption("-Xgenregmap");

		/* turn on precise GC while we're at it */
		addOption("-Xgc:precise");
		}
		}

		/* enable debugging; set suspend=y to pause during VM init */
		/* use android ADB transport */
		addOption("-agentlib:jdwp=transport=dt_android_adb,suspend=n,server=y");
		@@ -732,12 +644,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		lockProfThresholdBuf,
		"-Xlockprofthreshold:");

		/* Force interpreter-only mode for selected opcodes. Eg "1-0a,3c,f1-ff" */
		parseRuntimeOption("dalvik.vm.jit.op", jitOpBuf, "-Xjitop:");

		/* Force interpreter-only mode for selected methods */
		parseRuntimeOption("dalvik.vm.jit.method", jitMethodBuf, "-Xjitmethod:");

		if (executionMode == kEMIntPortable) {
		addOption("-Xint:portable");
		} else if (executionMode == kEMIntFast) {
		@@ -746,12 +652,7 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		addOption("-Xint:jit");
		}

		// libart tolerates libdvm flags, but not vice versa, so only pass some options if libart.
		property_get("persist.sys.dalvik.vm.lib.2", dalvikVmLibBuf, "libart.so");
		bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0);

		if (libart) {
		// If we booting without the real /data, don't spend time compiling.
		// If we are booting without the real /data, don't spend time compiling.
		property_get("vold.decrypt", voldDecryptBuf, "");
		bool skip_compilation = ((strcmp(voldDecryptBuf, "trigger_restart_min_framework") == 0) \|\|
		(strcmp(voldDecryptBuf, "1") == 0));
		@@ -802,8 +703,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		property_get("dalvik.vm.dex2oat-flags", dex2oatFlagsBuf, "");
		parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option");

		}

		/* extra options; parse this late so it overrides others */
		property_get("dalvik.vm.extra-opts", extraOptsBuf, "");
		parseExtraOpts(extraOptsBuf, NULL);
		@@ -820,7 +719,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		/*
		* Set profiler options
		*/
		if (libart) {
		// Whether or not the profiler should be enabled.
		property_get("dalvik.vm.profiler", propBuf, "0");
		if (propBuf[0] == '1') {
		@@ -881,7 +779,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		"-XX:NativeBridge=%s", propBuf);
		addOption(nativeBridgeLibrary);
		}
		}

		initArgs.version = JNI_VERSION_1_4;
		initArgs.options = mOptions.editArray();