Consider the logic when AOT is performed before TAC

Change-Id: I72f9328b7919262f882dcf2a9011f8e0184063d2

diff --git a/NativeLauncher/tool/tac_installer.cc b/NativeLauncher/tool/tac_installer.cc
index 3a6b1d694ecd9754468ba17831ce8c9d2813033d..fffcaefb6bd7c79692d9fe6834b8e465b26c20a7 100644 (file)
--- a/NativeLauncher/tool/tac_installer.cc
+++ b/NativeLauncher/tool/tac_installer.cc
@@ -139,26 +139,32 @@ static bool copyAssemblyCreateSymlink(std::string binPath, std::string tacDir, s
                                                _ERR("Failed to copy of %s", niFile.c_str());
                                        }
                                }
-                               bf::create_symlink(concatPath(tac_version_dir, assembly), concatPath(tacDir, assembly), error);
+
+                               if (exist(binNiPath)) {
+                                       bf::create_symlink(concatPath(tac_version_dir, niFile), concatPath(tacDir, assembly), error);
+                               } else {
+                                       bf::create_symlink(concatPath(tac_version_dir, assembly), concatPath(tacDir, assembly), error);
+                               }
                                if (error) {
                                        _ERR("Failed to create symlink %s file", concatPath(tacDir, assembly).c_str());
                                        nuget_restoration = true;
                                        break;
                                }
-                               if (exist(concatPath(tac_version_dir, niFile)) && exist(binNiPath)) {
-                                       bf::create_symlink(concatPath(tac_version_dir, niFile), concatPath(tacDir, assembly), error);
-                                       if (error) {
-                                               _ERR("Failed to create symlink %s file", concatPath(tacDir, assembly).c_str());
-                                       }
-                               }
-
                                copySmackAndOwnership(tacDir, concatPath(tacDir, assembly), true);
 
+                               if (exist(binNiPath) && exist(concatPath(tac_version_dir, niFile))) {
+                                       bf::create_symlink(concatPath(tac_version_dir, niFile), concatPath(tacDir, niFile));
+                                       copySmackAndOwnership(tacDir, concatPath(tacDir, niFile), true);
+                               }
+
                                if (!removeFile(concatPath(binPath, assembly))) {
                                        _ERR("Failed to remove of %s", assembly.c_str());
                                        nuget_restoration = true;
                                        break;
                                }
+                               if (!removeFile(concatPath(binNiPath, assembly))) {
+                                       _ERR("Failed to remove of %s", assembly.c_str());
+                               }
                                if (!removeFile(concatPath(binNiPath, niFile))) {
                                        _ERR("Failed to remove of %s", niFile.c_str());
                                }