projects
/
platform
/
core
/
dotnet
/
launcher.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1996ea
)
Fix missed ni.dll in tpa list
author
pius.lee
<pius.lee@samsung.com>
Thu, 24 Nov 2016 01:58:47 +0000
(10:58 +0900)
committer
pius.lee
<pius.lee@samsung.com>
Thu, 24 Nov 2016 01:58:47 +0000
(10:58 +0900)
Change-Id: I42a2bad8ebde5b6c056b2f12a5145ba31eda1d98
NativeLauncher/util/utils.cc
patch
|
blob
|
history
diff --git
a/NativeLauncher/util/utils.cc
b/NativeLauncher/util/utils.cc
index
2cc1026
..
df30ed0
100644
(file)
--- a/
NativeLauncher/util/utils.cc
+++ b/
NativeLauncher/util/utils.cc
@@
-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;
+ }
}
};