Merge "Query the enable_apex_image flag from native experiment." am: ed74814369 (d63481be) · Commits · e / os / android_frameworks_base

core/jni/AndroidRuntime.cpp

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -232,6 +232,11 @@ static const char* kGenerationalCCRuntimeOption = "-Xgc:generational_cc";
	// Copying (CC) garbage collector.		// Copying (CC) garbage collector.
	static const char* kNoGenerationalCCRuntimeOption = "-Xgc:nogenerational_cc";		static const char* kNoGenerationalCCRuntimeOption = "-Xgc:nogenerational_cc";

			// Feature flag name for running the JIT in Zygote experiment, b/119800099.
			static const char* ENABLE_APEX_IMAGE = "enable_apex_image";
			// Flag to pass to the runtime when using the apex image.
			static const char* kApexImageOption = "-Ximage:/system/framework/apex.art";

	static AndroidRuntime* gCurRuntime = NULL;		static AndroidRuntime* gCurRuntime = NULL;

	/*		/*
	@@ -666,8 +671,17 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv, bool zygote)
	char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];		char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];
	char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];		char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];

	if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) {		std::string use_apex_image =
	ALOGI("Boot image: '%s'\n", bootImageBuf);		server_configurable_flags::GetServerConfigurableFlag(RUNTIME_NATIVE_BOOT_NAMESPACE,
			ENABLE_APEX_IMAGE,
			/default_value=/ "");
			if (use_apex_image == "true") {
			addOption(kApexImageOption);
			ALOGI("Using Apex boot image: '%s'\n", kApexImageOption);
			} else if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) {
			ALOGI("Using dalvik.vm.boot-image: '%s'\n", bootImageBuf);
			} else {
			ALOGI("Using default boot image");
	}		}

	bool checkJni = false;		bool checkJni = false;