From: Cho Woong Suk <ws77.cho@samsung.com>
Date: Fri, 2 Feb 2018 02:57:16 +0000 (+0900)
Subject: support multi-architecture library for lib dir
X-Git-Tag: submit/tizen/20180208.005815^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49f6c9a5c2bd5b2ad296c84c4217d49c5c6f11c7;p=platform%2Fcore%2Fdotnet%2Flauncher.git

support multi-architecture library for lib dir

Change-Id: Id603602bf46d477f3aa57813ad2f7c19e07aad9c
(cherry picked from commit 39ed7656c266b754e71eb430c02ad60a980d869d)
---

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
index 265c925..af29793 100644
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
@@ -38,6 +38,29 @@ namespace tizen {
 namespace runtime {
 namespace dotnetcore {
 
+#if defined (__aarch64__)
+#define ARCHITECTURE_IDENTIFIER "arm64"
+#elif defined (__arm__)
+#define ARCHITECTURE_IDENTIFIER "arm"
+#elif defined (__x86_64__)
+#define ARCHITECTURE_IDENTIFIER "x64"
+#elif defined (__i386__)
+#define ARCHITECTURE_IDENTIFIER "x86"
+#else
+#define ARCHITECTURE_IDENTIFIER "unknown"
+#endif
+
+static std::string getExtraNativeLibDirs(const std::string& appRoot)
+{
+	// auto generated directory by nuget will be considered later
+	std::string candidate = concatPath(appRoot, "lib/" ARCHITECTURE_IDENTIFIER);
+	if (!strncmp(ARCHITECTURE_IDENTIFIER, "arm64", 5)) {
+		candidate = candidate + ":" + concatPath(appRoot, "lib/aarch64");
+	}
+
+	return candidate;
+}
+
 CoreRuntime::CoreRuntime() :
 	initializeClr(nullptr),
 	executeAssembly(nullptr),
@@ -188,7 +211,7 @@ int CoreRuntime::initialize(bool standalone)
 	assembliesInDirectory(searchDirectories, tpa);
 
 	std::string nativeLibPath;
-	nativeLibPath = appLib + ":" + appBin + ":" + __nativeLibDirectory;
+	nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appLib + ":" + appBin + ":" + __nativeLibDirectory;
 
 	std::string appName = std::string("dotnet-launcher-") + std::to_string(getpid());
 	if (!initializeCoreClr(appName.c_str(), probePath.c_str(), nativeLibPath.c_str(), tpa.c_str())) {