Fix dll filter in doAOTList (#433)

[platform/core/dotnet/launcher.git] / NativeLauncher / tool / ni_common.cc

diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc
index cecda2a..4796ad3 100644 (file)
--- a/NativeLauncher/tool/ni_common.cc
+++ b/NativeLauncher/tool/ni_common.cc
@@ -189,7 +189,7 @@ static bool isTPADll(const std::string& dllPath)
 
 /**
  * @brief create the directory including parents directory, and
- *        copy ownership and smack labels to the created directory.
+ *          copy ownership and smack labels to the created directory.
  * @param[in] target directory path
  * @param[in] source directory path to get ownership and smack label
  * @return if directory created successfully, return true otherwise false
@@ -683,24 +683,21 @@ static ni_error_e doAOTList(std::vector<std::string>& dllList, const std::string
        std::string coreLib = concatPath(__pm->getRuntimePath(), "System.Private.CoreLib.dll");
        bool hasSPC = false;
 
-       std::vector<std::string> niList;
        for (auto it = dllList.begin(); it != dllList.end(); it++) {
                std::string f = *it;
                if (!isFile(f)) {
                        _SERR("dll file is not exist : %s", f.c_str());
                        dllList.erase(it--);
                }
-               if (!isManagedAssembly(f)) {
+               else if (!isManagedAssembly(f)) {
                        _SERR("Input file is not a dll file : %s", f.c_str());
                        dllList.erase(it--);
                }
                // handle System.Private.CoreLib.dll separately.
                // dllList and path manager contain absolute path. So, there is no need to change path to absolute path
-               if (f == coreLib) {
+               else if (f == coreLib) {
                        hasSPC = true;
                        dllList.erase(it--);
-               } else {
-                       niList.push_back(changeExtension(f, ".dll", ".ni.dll"));
                }
        }