Merge "It's 2012. We're always WITH_JIT." (fec5f611) · Commits · e / os / android_frameworks_base

core/jni/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -11,10 +11,6 @@ else
		LOCAL_CFLAGS += -DPACKED=""
		endif

		ifeq ($(WITH_JIT),true)
		LOCAL_CFLAGS += -DWITH_JIT
		endif

		ifneq ($(USE_CUSTOM_RUNTIME_HEAP_MAX),)
		LOCAL_CFLAGS += -DCUSTOM_RUNTIME_HEAP_MAX=$(USE_CUSTOM_RUNTIME_HEAP_MAX)
		endif

+0 −8

Original line number	Diff line number	Diff line
		@@ -466,9 +466,7 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		kEMDefault,
		kEMIntPortable,
		kEMIntFast,
		#if defined(WITH_JIT)
		kEMJitCompiler,
		#endif
		} executionMode = kEMDefault;


		@@ -488,10 +486,8 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		executionMode = kEMIntPortable;
		} else if (strcmp(propBuf, "int:fast") == 0) {
		executionMode = kEMIntFast;
		#if defined(WITH_JIT)
		} else if (strcmp(propBuf, "int:jit") == 0) {
		executionMode = kEMJitCompiler;
		#endif
		}

		property_get("dalvik.vm.stack-trace-file", stackTraceFileBuf, "");
		@@ -640,7 +636,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		mOptions.add(opt);
		}

		#if defined(WITH_JIT)
		/* Force interpreter-only mode for selected opcodes. Eg "1-0a,3c,f1-ff" */
		char jitOpBuf[sizeof("-Xjitop:") + PROPERTY_VALUE_MAX];
		property_get("dalvik.vm.jit.op", propBuf, "");
		@@ -660,7 +655,6 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		opt.optionString = jitMethodBuf;
		mOptions.add(opt);
		}
		#endif

		if (executionMode == kEMIntPortable) {
		opt.optionString = "-Xint:portable";
		@@ -668,11 +662,9 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		} else if (executionMode == kEMIntFast) {
		opt.optionString = "-Xint:fast";
		mOptions.add(opt);
		#if defined(WITH_JIT)
		} else if (executionMode == kEMJitCompiler) {
		opt.optionString = "-Xint:jit";
		mOptions.add(opt);
		#endif
		}

		if (checkDexSum) {