From: j-h.choi Date: Mon, 30 Dec 2019 04:56:55 +0000 (+0900) Subject: Modified to skip the assemblies in the TPA list when applying TAC X-Git-Tag: submit/tizen/20200115.094236~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e4239a1aa0f9eceee23558f9bda07efdc8ae619;p=platform%2Fcore%2Fdotnet%2Flauncher.git Modified to skip the assemblies in the TPA list when applying TAC --- diff --git a/NativeLauncher/tool/tac_common.cc b/NativeLauncher/tool/tac_common.cc index 33d3eb6..1baa97f 100644 --- a/NativeLauncher/tool/tac_common.cc +++ b/NativeLauncher/tool/tac_common.cc @@ -452,8 +452,9 @@ std::vector depsJsonParser(std::string rootPath, std::string execNa for (auto& assembly : assemblies.getMemberNames()) { std::string assemblyName = assembly.substr(assembly.rfind('/') + 1); //Skip the assembly present in the TPA list - for (auto& tpa : tpaAssemblies) { - if (!strcmp(replaceAll(tpa, ".ni.dll", ".dll").c_str(), assembly.c_str())) { + for (auto& tpaPath : tpaAssemblies) { + std::string tpaName = replaceAll(tpaPath.substr(tpaPath.rfind('/') + 1), ".ni.dll", ".dll"); + if (!strcmp(tpaName.c_str(), assemblyName.c_str())) { isExistTpaAssembly = true; break; }