Modified to check extensions when deleting native image files

Change-Id: Ia4442d953a3c27db3679c5d20be108a208669551

diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc
index 3754715ba317d88d35006f1fcf57a0521eca2242..4d2e3d297da46f3b25d38c884dd775293c6885db 100644 (file)
--- a/NativeLauncher/tool/ni_common.cc
+++ b/NativeLauncher/tool/ni_common.cc
@@ -1183,7 +1183,8 @@ void removeNIPlatform()
 void removeNIUnderDirs(const std::string& rootPaths)
 {
        auto convert = [](const std::string& path, const std::string& filename) {
-               if (isR2RImage(path)) {
+               //The .ni.dll file can be renamed .dll.
+               if (isR2RImage(path) && isNativeImage(path)) {
                        std::string assemblyPath = changeExtension(path, ".ni.dll", ".dll");
                        if (exist(assemblyPath)) {
                                if (remove(path.c_str())) {
@@ -1205,7 +1206,8 @@ void removeNIUnderDirs(const std::string& rootPaths)
 static void removeNIUnderTAC(const std::string& rootPaths)
 {
        auto convert = [&rootPaths](const std::string& path, const std::string& filename) {
-               if (isNativeImage(path)) {
+               //The .ni.dll file can be renamed .dll.
+               if (isR2RImage(path) && isNativeImage(path)) {
                        std::string assemblyPath = changeExtension(path, ".ni.dll", ".dll");
                        if (exist(assemblyPath)) {
                                if (removeFile(assemblyPath)) {