Fix missed ni.dll in tpa list
authorpius.lee <pius.lee@samsung.com>
Thu, 24 Nov 2016 01:58:47 +0000 (10:58 +0900)
committerpius.lee <pius.lee@samsung.com>
Thu, 24 Nov 2016 01:58:47 +0000 (10:58 +0900)
Change-Id: I42a2bad8ebde5b6c056b2f12a5145ba31eda1d98

NativeLauncher/util/utils.cc

index 2cc1026eda65050f9f86bf8859c1c2ab1faf0b07..df30ed06ad66b50119fb2c7e2af091c7c03f9a83 100644 (file)
@@ -248,7 +248,14 @@ void AssembliesInDirectory(const std::vector<std::string>& directories, std::str
       }
 
       AssemblyFile f = {noext, ext};
-      addedAssemblies[f] = ni;
+      if (addedAssemblies.find(f) == addedAssemblies.end())
+      {
+        addedAssemblies[f] = ni;
+      }
+      else
+      {
+        addedAssemblies[f] |= ni;
+      }
     }
   };