From: 최종헌/MDE Lab(SR)/삼성전자 <j-h.choi@samsung.com>
Date: Sun, 28 Jan 2024 23:54:56 +0000 (+0900)
Subject: TAC is applied to all dlls in the R2R mode (#502)
X-Git-Tag: accepted/tizen/unified/20240129.163413^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6da720e061c110ca81d1617c40cc5f8a4eb35d96;hp=33b0bf89cdb70a6844a55a5eba87c793f549ff4c;p=platform%2Fcore%2Fdotnet%2Flauncher.git

TAC is applied to all dlls in the R2R mode (#502)
---

diff --git a/NativeLauncher/tool/tac_common.cc b/NativeLauncher/tool/tac_common.cc
index 71623b3..93462ec 100644
--- a/NativeLauncher/tool/tac_common.cc
+++ b/NativeLauncher/tool/tac_common.cc
@@ -371,19 +371,6 @@ std::vector<std::string> depsJsonParser(const std::string& rootPath, const std::
 				}
 				const Json::Value runtimeTargetName = root["runtimeTarget"]["name"];
 				const Json::Value nugetPackages = root["targets"][runtimeTargetName.asString().c_str()];
-				std::vector<std::string> appDependencies;
-				for (auto& nuget : nugetPackages.getMemberNames()) {
-					if (strstr(nuget.c_str(), (execName.substr(0, execName.find(".Tizen."))).c_str()) != NULL ||
-						strstr(nuget.c_str(), (execName.substr(0, execName.find(".dll"))).c_str()) != NULL) {
-						const Json::Value assemblies = nugetPackages[nuget.c_str()]["runtime"];
-						if (assemblies != Json::nullValue) {
-							const Json::Value dependencies = nugetPackages[nuget.c_str()]["dependencies"];
-							for (auto& dependency : dependencies.getMemberNames()) {
-								appDependencies.push_back(dependency);
-							}
-						}
-					}
-				}
 				for (auto& nuget : nugetPackages.getMemberNames()) {
 					//Skip the nuget package related to Tizen
 					if (strstr(nuget.c_str(), TIZEN_DOTNET_NUGET) == NULL &&
@@ -392,36 +379,15 @@ std::vector<std::string> depsJsonParser(const std::string& rootPath, const std::
 						strstr(nuget.c_str(), (execName.substr(0, execName.find(".dll"))).c_str()) == NULL) {
 						const Json::Value assemblies = nugetPackages[nuget.c_str()]["runtime"];
 						if (assemblies != Json::nullValue) {
-							const Json::Value dependencies = nugetPackages[nuget.c_str()]["dependencies"];
-							bool hasDependency = false;
-							for (auto& dependency : dependencies.getMemberNames()) {
-								//Skip the nugget package that is dependent on another nuget package
-								if (strstr(dependency.c_str(), TIZEN_DOTNET_NUGET) == NULL &&
-									strstr(dependency.c_str(), NET_STANDARD_LIBRARY_NUGET) == NULL) {
-									hasDependency = true;
-									for (auto& ad : appDependencies) {
-										if (!strcmp(ad.c_str(), dependency.c_str())) {
-											hasDependency = true;
-											break;
-										} else {
-											hasDependency = false;
-										}
-									}
-									if (hasDependency) break;
-								}
-							}
-							if (!hasDependency) {
-								// handle assembly even though that is included in the TPA.
-								for (auto& assembly : assemblies.getMemberNames()) {
-									std::string assemblyName = assembly.substr(assembly.rfind('/') + 1);
-									parserData.push_back(nuget + ":" + assemblyName);
-									_INFO("Nuget : [%s] / Assembly : [%s]", nuget.c_str(), assemblyName.c_str());
-								}
+							// handle assembly even though that is included in the TPA.
+							for (auto& assembly : assemblies.getMemberNames()) {
+								std::string assemblyName = assembly.substr(assembly.rfind('/') + 1);
+								parserData.push_back(nuget + ":" + assemblyName);
+								_INFO("Nuget : [%s] / Assembly : [%s]", nuget.c_str(), assemblyName.c_str());
 							}
 						}
 					}
 				}
-				appDependencies.clear();
 				ifs.close();
 			}
 		}
diff --git a/NativeLauncher/tool/tac_installer.cc b/NativeLauncher/tool/tac_installer.cc
index 7444f94..c01a616 100644
--- a/NativeLauncher/tool/tac_installer.cc
+++ b/NativeLauncher/tool/tac_installer.cc
@@ -997,7 +997,7 @@ void install_Clean()
 	}
 
 	for (auto& cl : createLibraries) {
-		changeOwnershipTAC(cl);
+		copySmackAndOwnership(__DOTNET_DIR, cl);
 	}
 }