X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=NativeLauncher%2Flauncher%2Flib%2Fcore_runtime.cc;h=4fb9562bf64f7d76679f9a8920e912b5d5e194cd;hb=667e87b9e2fd3879ba6100b7fde9295408f9c337;hp=2f1d7d6fa3942ea3e31f1030bb0ecf6d68801935;hpb=5f6eec9e0559d28f59ce0c15aac9006b149206ef;p=platform%2Fcore%2Fdotnet%2Flauncher.git

diff --git a/NativeLauncher/launcher/lib/core_runtime.cc b/NativeLauncher/launcher/lib/core_runtime.cc
index 2f1d7d6..4fb9562 100644
--- a/NativeLauncher/launcher/lib/core_runtime.cc
+++ b/NativeLauncher/launcher/lib/core_runtime.cc
@@ -277,12 +277,15 @@ void preload()
 
 bool initializeCoreClr(PathManager* pm, const std::string& tpa)
 {
+	bool ncdbStartupHook = isNCDBStartupHookProvided();
+
 	const char *propertyKeys[] = {
 		"TRUSTED_PLATFORM_ASSEMBLIES",
 		"APP_PATHS",
 		"APP_NI_PATHS",
 		"NATIVE_DLL_SEARCH_DIRECTORIES",
-		"AppDomainCompatSwitch"
+		"AppDomainCompatSwitch",
+		ncdbStartupHook ? "STARTUP_HOOKS" : "" // must be the last one
 	};
 
 	const char *propertyValues[] = {
@@ -290,14 +293,15 @@ bool initializeCoreClr(PathManager* pm, const std::string& tpa)
 		pm->getAppPaths().c_str(),
 		pm->getAppNIPaths().c_str(),
 		pm->getNativeDllSearchingPaths().c_str(),
-		"UseLatestBehaviorWhenTFMNotSpecified"
+		"UseLatestBehaviorWhenTFMNotSpecified",
+		ncdbStartupHook ? getNCDBStartupHook() : "" // must be the last one
 	};
 
 	std::string selfPath = readSelfPath();
 
 	int st = initializeClr(selfPath.c_str(),
 							"TizenDotnetApp",
-							sizeof(propertyKeys) / sizeof(propertyKeys[0]),
+							sizeof(propertyKeys) / sizeof(propertyKeys[0]) - (ncdbStartupHook ? 0 : 1),
 							propertyKeys,
 							propertyValues,
 							&__hostHandle,