Fixed TAC related bugs caused by function integration patch
[platform/core/dotnet/launcher.git] / NativeLauncher / tool / ni_common.cc
index ea63ecf..f7b69ad 100644 (file)
@@ -17,7 +17,6 @@
 #include <pkgmgr-info.h>
 #include <pkgmgr_installer_info.h>
 #include <aul.h>
-#include <tzplatform_config.h>
 
 #include "log.h"
 #include "utils.h"
 #include <wait.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
 #include <algorithm>
 #include <string>
 #include <fstream>
 #include <sstream>
 
-#include <pwd.h>
 #include <grp.h>
 #include <unistd.h>
 #include <string.h>
@@ -77,7 +77,7 @@ static const char* CROSSGEN_OPT_SINGLE_FILE_COMPILATION = "--single-file-compila
 //static const char* CROSSGEN_OPT_PARALLELISM = "--parallelism";
 //static const char* CROSSGEN_OPT_PARALLELISM_COUNT = "5";
 static const char* CROSSGEN_OPT_RESILIENT = "--resilient";
-static const char* CROSSGEN_OPT_OPTIMIZE = "-O";
+//static const char* CROSSGEN_OPT_OPTIMIZE = "-O";
 static const char* CROSSGEN_OPT_OPTIMIZE_TIME = "--Ot";
 static const char* CROSSGEN_OPT_INPUTBUBBLE = "--inputbubble";
 static const char* CROSSGEN_OPT_COMPILE_BUBBLE_GENERICS = "--compilebubblegenerics";
@@ -113,17 +113,6 @@ static void waitInterval()
 }
 
 #ifdef UNIQUE_DEFAULT_BASE_ADDR_SUPPORT
-static uintptr_t getFileSize(const std::string& path)
-{
-       struct stat sb;
-
-       if (stat(path.c_str(), &sb) == 0) {
-               return sb.st_size;
-       }
-
-       return 0;
-}
-
 // Get next base address to be used for system ni image from file
 // __SYSTEM_BASE_FILE should be checked for existance before calling this function
 static uintptr_t getNextBaseAddrFromFile()
@@ -202,7 +191,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
@@ -241,8 +230,39 @@ static bool createDirsAndCopyOwnerShip(std::string& target_path, const std::stri
        return true;
 }
 
-static std::string getNIFilePath(const std::string& dllPath)
+static std::string getNIFilePath(const std::string& absDllPath, NIOption* opt)
 {
+       std::string dllPath = absDllPath;
+       std::string fileName = getFileName(absDllPath);
+       if (opt->flags & NI_FLAGS_APPNI) {
+               std::string niDirPath;
+               std::string niTmpDirPath;
+               std::string prevPath;
+
+               prevPath = getBaseName(absDllPath);
+               niDirPath = concatPath(prevPath, APP_NI_SUB_DIR);
+               niTmpDirPath = concatPath(prevPath, APP_NI_SUB_TMP_DIR);
+
+               if (opt->flags & NI_FLAGS_APP_UNDER_RO_AREA) {
+                       niTmpDirPath = replaceAll(niTmpDirPath, getBaseName(__pm->getAppRootPath()), __READ_ONLY_APP_UPDATE_DIR);
+                       niDirPath = replaceAll(niDirPath, getBaseName(__pm->getAppRootPath()), __READ_ONLY_APP_UPDATE_DIR);
+                       _INFO("App is installed in RO area. Change NI path to RW area(%s).", niTmpDirPath.c_str());
+               }
+
+               if (!isDirectory(niDirPath)) {
+                       if (!createDirsAndCopyOwnerShip(niTmpDirPath, prevPath)) {
+                               niTmpDirPath = prevPath;
+                               _SERR("fail to create dir (%s)", niTmpDirPath.c_str());
+                       }
+                       dllPath = concatPath(niTmpDirPath, fileName);
+               } else {
+                       dllPath = concatPath(niDirPath, fileName);
+               }
+       } else if (opt->flags & NI_FLAGS_RESOURCE_NI) {
+               std::string rpkDir = concatPath(__pm->getAppRootPath(), APP_NI_SUB_DIR);
+               dllPath = createDir(rpkDir) ? concatPath(rpkDir, fileName) : concatPath(__pm->getAppRootPath(), fileName);
+       }
+
        size_t index = dllPath.find_last_of(".");
        if (index == std::string::npos) {
                _SERR("File doesnot contain extension. fail to get NI file name");
@@ -258,33 +278,9 @@ static std::string getNIFilePath(const std::string& dllPath)
        return niPath;
 }
 
-static std::string getAppNIFilePath(const std::string& absDllPath, NIOption* opt)
-{
-       std::string niDirPath;
-       std::string prevPath;
-
-       prevPath = getBaseName(absDllPath);
-       niDirPath = concatPath(prevPath, APP_NI_SUB_DIR);
-
-       if (opt->flags & NI_FLAGS_APP_UNDER_RO_AREA) {
-               niDirPath = replaceAll(niDirPath, getBaseName(__pm->getAppRootPath()), __READ_ONLY_APP_UPDATE_DIR);
-               _SERR("App is installed in RO area. Change NI path to RW area(%s).", niDirPath.c_str());
-               _ERR("App is installed in RO area. Change NI path to RW area(%s).", niDirPath.c_str());
-       }
-
-       if (!isDirectory(niDirPath)) {
-               if (!createDirsAndCopyOwnerShip(niDirPath, prevPath)) {
-                       niDirPath = prevPath;
-                       _SERR("fail to create dir (%s)", niDirPath.c_str());
-               }
-       }
-
-       return getNIFilePath(concatPath(niDirPath, getFileName(absDllPath)));
-}
-
-static bool checkNIExistence(const std::string& absDllPath)
+static bool checkNIExistence(const std::string& absDllPath, NIOption* opt)
 {
-       std::string absNIPath = getNIFilePath(absDllPath);
+       std::string absNIPath = getNIFilePath(absDllPath, opt);
        if (absNIPath.empty()) {
                return false;
        }
@@ -302,25 +298,11 @@ static bool checkNIExistence(const std::string& absDllPath)
        return false;
 }
 
-static bool checkAppNIExistence(const std::string& absDllPath, NIOption* opt)
-{
-       std::string absNIPath = getAppNIFilePath(absDllPath, opt);
-       if (absNIPath.empty()) {
-               return false;
-       }
-
-       if (isFile(absNIPath)) {
-               return true;
-       }
-
-       return false;
-}
-
 static bool checkDllExistInDir(const std::string& path)
 {
        bool ret = false;
        auto func = [&ret](const std::string& f_path, const std::string& f_name) {
-               if (isManagedAssembly(f_name) || isNativeImage(f_name)) {
+               if (isManagedAssembly(f_name) || isR2RImage(f_name)) {
                        ret = true;
                }
        };
@@ -331,41 +313,18 @@ static bool checkDllExistInDir(const std::string& path)
 }
 
 /*
- * Get the list of managed files in the specific directory
+ * Get the list of managed files in the specific directory (of Application)
  * Absolute paths of managed files are stored at the result list.
- * If native image already exist in the same directory, managed file is ignored.
+ * If native image already exist in the (same / .native_image) directory, managed file is ignored.
  */
-static ni_error_e getTargetDllList(const std::string& path, std::vector<std::string>& fileList)
-{
-       if (!isDirectory(path)) {
-               return NI_ERROR_INVALID_PARAMETER;
-       }
-
-       auto func = [&fileList](const std::string& f_path, const std::string& f_name) {
-               if (isManagedAssembly(f_path) && !checkNIExistence(f_path)) {
-                       fileList.push_back(getAbsolutePath(f_path));
-               }
-       };
-
-       scanFilesInDirectory(path, func, 0);
-
-       return NI_ERROR_NONE;
-}
-
-/*
- * Get the list of managed files in the specific directory of Application
- * Absolute paths of managed files are stored at the result list.
- * If native image already exist in the .native_image directory, managed file is ignored.
- *
- */
-static ni_error_e getAppTargetDllList(const std::string& path, std::vector<std::string>& fileList, NIOption *opt)
+static ni_error_e getTargetDllList(const std::string& path, std::vector<std::string>& fileList, NIOption *opt)
 {
        if (!isDirectory(path)) {
                return NI_ERROR_INVALID_PARAMETER;
        }
 
        auto func = [&fileList, opt](const std::string& f_path, const std::string& f_name) {
-               if (isManagedAssembly(f_path) && !checkAppNIExistence(f_path, opt)) {
+               if (isManagedAssembly(f_path) && !checkNIExistence(f_path, opt)) {
                        fileList.push_back(getAbsolutePath(f_path));
                }
        };
@@ -493,7 +452,7 @@ static ni_error_e crossgen2PostAction(const std::string& dllPath, const std::str
 
        // if AppNI then move ni.dll file to .native_image and copy pdb to .native_image
        if (opt->flags & NI_FLAGS_APPNI) {
-               outFile = getAppNIFilePath(dllPath, opt);
+               outFile = getNIFilePath(dllPath, opt);
                makePdbSymlinkForNI(dllPath, outFile);
 
                if (opt->flags & NI_FLAGS_INPUT_BUBBLE && opt->flags & NI_FLAGS_NO_PIPELINE) {
@@ -505,6 +464,17 @@ static ni_error_e crossgen2PostAction(const std::string& dllPath, const std::str
                }
        }
 
+       if (opt->flags & NI_FLAGS_RM_ORIGIN_AFTER_NI) {
+               if (!removeFile(dllPath)) {
+                       _SERR("Fail to remove original file : %s", dllPath.c_str());
+               }
+       }
+
+       if (opt->flags & NI_FLAGS_RESOURCE_NI) {
+               moveFile(niPath, changeExtension(dllPath, ".dll", ".ni.dll"));
+               removeAll(concatPath(__pm->getAppRootPath(), APP_NI_SUB_DIR));
+       }
+
        if (!(opt->flags & NI_FLAGS_INPUT_BUBBLE && opt->flags & NI_FLAGS_NO_PIPELINE)) {
                _SOUT("Native image %s generated successfully.", outFile.c_str());
        }
@@ -512,6 +482,22 @@ static ni_error_e crossgen2PostAction(const std::string& dllPath, const std::str
        return NI_ERROR_NONE;
 }
 
+void setPriority(NIOption* opt)
+{
+       pid_t pid = getpid();
+       if (setpriority(PRIO_PROCESS, pid, opt->priority) == 0) {
+               std::string str = " ";
+               if (opt->priority <= -20) {
+                       str = " highest ";
+               } else if (opt->priority >= 19) {
+                       str = " lowest ";
+               }
+               _SOUT("Success to set the%spriority of the process. pid : [%d], priority : [%d]", str.c_str(), pid, getpriority(PRIO_PROCESS, pid));
+       } else {
+               _SERR("Failed to set the priority of the process. pid : [%d], priority : [%d]", pid, getpriority(PRIO_PROCESS, pid));
+       }
+}
+
 static ni_error_e crossgen2PipeLine(const std::vector<std::string>& dllList, const std::vector<std::string>& refPaths, NIOption* opt)
 {
        // fork crossgen2
@@ -534,6 +520,9 @@ static ni_error_e crossgen2PipeLine(const std::vector<std::string>& dllList, con
                        return NI_ERROR_ABNORMAL_PROCESS_TERMINATION;
                }
        } else {
+               if (opt->flags & NI_FLAGS_SET_PRIORITY) {
+                       setPriority(opt);
+               }
                std::vector<const char*> argv;
                makeArgs(argv, refPaths, opt);
                argv.push_back(CROSSGEN_OPT_OUT_NEAR_INPUT);
@@ -567,11 +556,8 @@ static ni_error_e crossgen2NoPipeLine(const std::vector<std::string>& dllList, c
 {
        for (auto& dllPath : dllList) {
                std::string niPath;
-               if (opt->flags & NI_FLAGS_APPNI) {
-                       niPath = getAppNIFilePath(dllPath, opt);
-               } else {
-                       niPath = getNIFilePath(dllPath);
-               }
+               niPath = getNIFilePath(dllPath, opt);
+
 #ifdef UNIQUE_DEFAULT_BASE_ADDR_SUPPORT
                uintptr_t baseAddr = 0;
                if (isTPADll(dllPath)) {
@@ -607,6 +593,9 @@ static ni_error_e crossgen2NoPipeLine(const std::vector<std::string>& dllList, c
                                return NI_ERROR_ABNORMAL_PROCESS_TERMINATION;
                        }
                } else {
+                       if (opt->flags & NI_FLAGS_SET_PRIORITY) {
+                               setPriority(opt);
+                       }
                        std::vector<const char*> argv;
                        makeArgs(argv, refPaths, opt);
 
@@ -660,7 +649,15 @@ static ni_error_e createCoreLibNI(NIOption* opt)
 
        if (!isFile(coreLibBackup) && !isR2RImage(coreLib)) {
                if (crossgen2NoPipeLine(dllList, refPaths, opt) == NI_ERROR_NONE) {
-                       if (rename(coreLib.c_str(), coreLibBackup.c_str())) {
+                       if (opt->flags & NI_FLAGS_RM_ORIGIN_AFTER_NI) {
+                               std::ofstream output(coreLibBackup);
+                               if (!exist(coreLibBackup)) {
+                                       _SERR("Failed to create System.Private.CoreLib.dll.Backup");
+                                       return NI_ERROR_CORE_NI_FILE;
+                               }
+                               copySmackAndOwnership(__pm->getRuntimePath(), coreLibBackup, false);
+                               output.close();
+                       } else if (rename(coreLib.c_str(), coreLibBackup.c_str())) {
                                _SERR("Failed to rename from System.Private.CoreLib.dll to System.Private.CoreLib.dll.Backup");
                                return NI_ERROR_CORE_NI_FILE;
                        }
@@ -668,7 +665,7 @@ static ni_error_e createCoreLibNI(NIOption* opt)
                                if (rename(niTmpCoreLib.c_str(), coreLib.c_str())) {
                                        _SERR("Failed to rename from System.Private.CoreLib.ni.dll.tmp to Private.CoreLib.dll");
                                        return NI_ERROR_CORE_NI_FILE;
-                               }                               
+                               }
                        } else {
                                if (rename(niCoreLib.c_str(), coreLib.c_str())) {
                                        _SERR("Failed to rename from System.Private.CoreLib.ni.dll to Private.CoreLib.dll");
@@ -683,6 +680,25 @@ static ni_error_e createCoreLibNI(NIOption* opt)
        return NI_ERROR_NONE;
 }
 
+static void renameAppNITmpPath(NIOption* opt)
+{
+       std::string niTmpPath = __pm->getAppRootPath() + "/bin/" + APP_NI_SUB_TMP_DIR;
+       std::string niPath = __pm->getAppRootPath() + "/bin/" + APP_NI_SUB_DIR;
+
+       if (opt->flags & NI_FLAGS_APP_UNDER_RO_AREA) {
+               niTmpPath = replaceAll(niTmpPath, getBaseName(__pm->getAppRootPath()), __READ_ONLY_APP_UPDATE_DIR);
+               niPath = replaceAll(niPath, getBaseName(__pm->getAppRootPath()), __READ_ONLY_APP_UPDATE_DIR);
+       }
+
+       if (isDirectory(niTmpPath)) {
+               if (rename(niTmpPath.c_str(), niPath.c_str())) {
+                       _SERR("Fail to rename from .native_image_tmp to .native_image");
+               } else {
+                       _SOUT("Success to rename from %s to %s", niTmpPath.c_str(), niPath.c_str());
+               }
+       }
+}
+
 static ni_error_e doAOTList(std::vector<std::string>& dllList, const std::string& refPaths, NIOption* opt)
 {
        ni_error_e ret = NI_ERROR_NONE;
@@ -696,27 +712,29 @@ 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"));
                }
        }
 
+       // Error : Multiple input files matching same simple name
+       // So, Remove dulicate files from dll list
+       std::sort(dllList.begin(), dllList.end());
+       dllList.erase(unique(dllList.begin(), dllList.end()), dllList.end());
+
        // In the case of SPC, post-processing is required to change the name of the native image.
        // In order to avoid repeatedly checking whether the generated native image is an SPC,
        // the SPC native image generation is performed separately.
@@ -760,22 +778,22 @@ static ni_error_e doAOTList(std::vector<std::string>& dllList, const std::string
                }
        }
 
-       if (ret == NI_ERROR_NONE && opt->flags & NI_FLAGS_INPUT_BUBBLE) {
-               for (auto &dll : dllList) {
-                       std::string tmpFile;
-                       std::string niFile;
-                       if (opt->flags & NI_FLAGS_APPNI) {
-                               niFile = getAppNIFilePath(dll, opt);
-                       } else {
-                               niFile = getNIFilePath(dll);
-                       }
-                       tmpFile = niFile + ".tmp";
+       if (ret == NI_ERROR_NONE) {
+               if (opt->flags & NI_FLAGS_INPUT_BUBBLE) {
+                       for (auto &dll : dllList) {
+                               std::string tmpFile;
+                               std::string niFile = getNIFilePath(dll, opt);
+                               tmpFile = niFile + ".tmp";
 
-                       if (exist(tmpFile)) {
-                               moveFile(tmpFile, niFile);
-                               _SOUT("Native image %s generated successfully.", niFile.c_str());
+                               if (exist(tmpFile)) {
+                                       moveFile(tmpFile, niFile);
+                                       _SOUT("Native image %s generated successfully.", niFile.c_str());
+                               }
                        }
                }
+               if (opt->flags & NI_FLAGS_APPNI) {
+                       renameAppNITmpPath(opt);
+               }
        }
 
        return ret;
@@ -788,58 +806,89 @@ static ni_error_e doAOTFile(const std::string& dllFile, const std::string& refPa
                return NI_ERROR_NO_SUCH_FILE;
        }
 
+       if (checkNIExistence(dllFile, opt)) {
+               _SERR("Native image file is already exist : %s", dllFile.c_str());
+               return NI_ERROR_ALREADY_EXIST;
+       }
+
        if (!isManagedAssembly(dllFile)) {
                _SERR("Failed. Input parameter is not managed dll (%s)\n", dllFile.c_str());
                return NI_ERROR_INVALID_PARAMETER;
        }
 
-       if (checkNIExistence(dllFile)) {
-               _SERR("Native image file is already exist : %s", dllFile.c_str());
-               return NI_ERROR_ALREADY_EXIST;
-       }
-
        std::vector<std::string> dllList;
        dllList.push_back(getAbsolutePath(dllFile));
        return doAOTList(dllList, refPaths, opt);
 }
 
-// callback function of "pkgmgrinfo_appinfo_metadata_filter_foreach"
-static int appAotCb(pkgmgrinfo_appinfo_h handle, void *userData)
+static ni_error_e removeAndCreateNI(const char* pkgId, NIOption* pOptions)
+{
+       if (removeNIUnderPkgRoot(pkgId) != NI_ERROR_NONE) {
+               _SERR("Failed to remove previous dlls from [%s]", pkgId);
+               return NI_ERROR_UNKNOWN;
+       }
+
+       if (createNIUnderPkgRoot(pkgId, pOptions) != NI_ERROR_NONE) {
+               _SERR("Failed to generate NI file [%s]", pkgId);
+               return NI_ERROR_UNKNOWN;
+       }
+
+       _SOUT("Complete make native image for pkg (%s)", pkgId);
+       return NI_ERROR_NONE;
+}
+
+static bool isReadOnlyPkg(std::string pkgId)
 {
-       char *pkgId = NULL;
        int ret = 0;
-       NIOption **pOptions = (NIOption**)userData;
-
-       if ((*pOptions)->flags & NI_FLAGS_SKIP_RO_APP) {
-               bool isSystem = false;
-               int ret = pkgmgrinfo_appinfo_is_system(handle, &isSystem);
-               if (ret != PMINFO_R_OK) {
-                       _SERR("Failed to check that app is System or not\n");
-                       return -1;
-               }
-               if (isSystem) {
-                       return 0;
-               }
+       bool readonly = false;
+       pkgmgrinfo_pkginfo_h handle;
+
+       ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgId.c_str(), &handle);
+       if (ret != PMINFO_R_OK) {
+               _ERR("Fail to get pkginfo");
+               return false;
        }
 
-       ret = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgId);
+       ret = pkgmgrinfo_pkginfo_is_readonly(handle, &readonly);
        if (ret != PMINFO_R_OK) {
-               _SERR("Failed to get pkgid");
-               return -1;
+               _ERR("Fail to get is_readonly");
+               pkgmgrinfo_pkginfo_destroy_pkginfo(handle);
+               return false;
        }
 
-       if (removeNIUnderPkgRoot(pkgId) != NI_ERROR_NONE) {
-               _SERR("Failed to remove previous dlls from [%s]", pkgId);
+       pkgmgrinfo_pkginfo_destroy_pkginfo(handle);
+       return readonly;
+}
+
+// callback function of "pkgmgrinfo_appinfo_metadata_filter_foreach"
+static int appAotCb(pkgmgrinfo_appinfo_h handle, void *userData)
+{
+       char *pkgId = NULL;
+       int ret = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgId);
+       if (ret != PMINFO_R_OK) {
+               _SERR("Failed to get pkgid");
                return -1;
        }
 
-       if (createNIUnderPkgRoot(pkgId, *pOptions) != NI_ERROR_NONE) {
-               _SERR("Failed to generate NI file [%s]", pkgId);
+       std::vector<std::string> *pkgList = (std::vector<std::string> *)userData;
+       pkgList->push_back(pkgId);
+
+       return 0;
+}
+
+// callback function of "pkgmgrinfo_pkginfo_metadata_filter_foreach"
+static int pkgAotCb(pkgmgrinfo_pkginfo_h handle, void *userData)
+{
+       char *pkgId = NULL;
+       int ret = pkgmgrinfo_pkginfo_get_pkgid(handle, &pkgId);
+       if (ret != PMINFO_R_OK) {
+               _SERR("Failed to get pkgid");
                return -1;
-       } else {
-               _SOUT("Complete make application to native image");
        }
 
+       std::vector<std::string> *pkgList = (std::vector<std::string> *)userData;
+       pkgList->push_back(pkgId);
+
        return 0;
 }
 
@@ -924,8 +973,11 @@ ni_error_e createNIUnderTAC(const std::string& targetPath, const std::string& re
 {
        ni_error_e ret;
 
+       // NI fils of TAC-related dlls under /opt/usr/dotnet should not be created under .native_image directory.
+       // So, unset NI_FLAGS_APPNI temporally and restore it after running AOT.
        bool isAppNI = false;
        if (opt->flags & NI_FLAGS_APPNI) {
+               opt->flags &= ~NI_FLAGS_APPNI;
                isAppNI = true;
        }
 
@@ -941,7 +993,7 @@ ni_error_e createNIUnderTAC(const std::string& targetPath, const std::string& re
 
        // get managed file list from targetPath
        std::vector<std::string> dllList;
-       ret = getTargetDllList(targetPath, dllList);
+       ret = getTargetDllList(targetPath, dllList, opt);
        if (ret != NI_ERROR_NONE) {
                return ret;
        }
@@ -950,26 +1002,21 @@ ni_error_e createNIUnderTAC(const std::string& targetPath, const std::string& re
        std::vector<std::string> niList;
 
        for (auto &dll : dllList) {
-               if (!checkNIExistence(dll)) {
+               if (!checkNIExistence(dll, opt)) {
                        needNIList.push_back(dll);
                }
-               niList.push_back(getNIFilePath(dll));
+               niList.push_back(getNIFilePath(dll, opt));
        }
 
        if (!needNIList.empty()) {
-               // NI fils of TAC-related dlls under /opt/usr/dotnet should not be created under .native_image directory.
-               // So, unset NI_FLAGS_APPNI temporally and restore it after running AOT.
-               opt->flags &= ~NI_FLAGS_APPNI;
                ret = doAOTList(needNIList, refPaths, opt);
-               if (isAppNI) {
-                       opt->flags |= NI_FLAGS_APPNI;
-               }
                if (ret != NI_ERROR_NONE) {
                        return ret;
                }
        }
 
        if (isAppNI) {
+               opt->flags |= NI_FLAGS_APPNI;
                for (auto &niPath : niList) {
                        if (exist(niPath)) {
                                std::string symNIPath = concatPath(targetPath, getFileName(niPath));
@@ -986,7 +1033,6 @@ ni_error_e createNIUnderTAC(const std::string& targetPath, const std::string& re
        return NI_ERROR_NONE;
 }
 
-
 ni_error_e createNIUnderDirs(const std::string& rootPaths, NIOption* opt)
 {
        ni_error_e ret = NI_ERROR_NONE;
@@ -1013,13 +1059,8 @@ ni_error_e createNIUnderDirs(const std::string& rootPaths, NIOption* opt)
                        if (ret != NI_ERROR_NONE) {
                                return ret;
                        }
-               } else if (opt->flags & NI_FLAGS_APPNI) {
-                       ret = getAppTargetDllList(path, fileList, opt);
-                       if (ret != NI_ERROR_NONE) {
-                               return ret;
-                       }
                } else {
-                       ret = getTargetDllList(path, fileList);
+                       ret = getTargetDllList(path, fileList, opt);
                        if (ret != NI_ERROR_NONE) {
                                return ret;
                        }
@@ -1047,7 +1088,6 @@ ni_error_e createNIUnderPkgRoot(const std::string& pkgId, NIOption* opt)
                _SERR("Failed to get root path from [%s]", pkgId.c_str());
                return NI_ERROR_INVALID_PACKAGE;
        }
-
        __pm->setAppRootPath(rootPath);
 
        char* extraDllPaths = pluginGetExtraDllPath();
@@ -1056,19 +1096,34 @@ ni_error_e createNIUnderPkgRoot(const std::string& pkgId, NIOption* opt)
                splitPath(extraDllPaths, opt->extraRefPath);
        }
 
-       opt->flags |= NI_FLAGS_APPNI;
+       std::string targetDirs;
+       if (isRPK(pkgId)) {
+               opt->flags &= ~NI_FLAGS_APPNI; // added to exclude logic of APP_NI
+               opt->flags |= NI_FLAGS_RESOURCE_NI; // added flag for RPK type
+               opt->flags |= NI_FLAGS_NO_PIPELINE; // added the flag to set the output path
 
-       if (isReadOnlyArea(rootPath)) {
-               opt->flags |= NI_FLAGS_APP_UNDER_RO_AREA;
-               opt->flags |= NI_FLAGS_NO_PIPELINE;
-               _SERR("Only no-pipeline mode supported for RO app. Set no-pipeline option forcibly");
+               std::string paths = getResourcePaths(rootPath);
+               if (paths.empty()) {
+                       _SERR("Failed to get rpk paths from [%s]", pkgId.c_str());
+                       return NI_ERROR_UNKNOWN;
+               }
+               targetDirs = paths;
        } else {
-               opt->flags &= ~NI_FLAGS_APP_UNDER_RO_AREA;
+               opt->flags |= NI_FLAGS_APPNI;
+               opt->flags &= ~NI_FLAGS_RESOURCE_NI; // added to exclude logic of RESOURCE_NI
+
+               if (isReadOnlyArea(rootPath)) {
+                       opt->flags |= NI_FLAGS_APP_UNDER_RO_AREA;
+                       opt->flags |= NI_FLAGS_NO_PIPELINE;
+                       _SERR("Only no-pipeline mode supported for RO app. Set no-pipeline option forcibly");
+               } else {
+                       opt->flags &= ~NI_FLAGS_APP_UNDER_RO_AREA;
+               }
+
+               targetDirs = __pm->getAppPaths();
        }
 
-       // create native image under bin and lib directory
-       // tac directory is skipped in the createNIUnderDirs.
-       return createNIUnderDirs(__pm->getAppPaths(), opt);
+       return createNIUnderDirs(targetDirs, opt);
 }
 
 void removeNIPlatform()
@@ -1103,9 +1158,14 @@ void removeNIPlatform()
 void removeNIUnderDirs(const std::string& rootPaths)
 {
        auto convert = [](const std::string& path, const std::string& filename) {
-               if (isNativeImage(path)) {
-                       if (remove(path.c_str())) {
-                               _SERR("Failed to remove %s", path.c_str());
+               if (isR2RImage(path)) {
+                       std::string assemblyPath = changeExtension(path, ".ni.dll", ".dll");
+                       if (exist(assemblyPath)) {
+                               if (remove(path.c_str())) {
+                                       _SERR("Failed to remove %s", path.c_str());
+                               }
+                       } else {
+                               _SOUT("%s cannot be removed because there is no %s", path.c_str(), assemblyPath.c_str());
                        }
                }
        };
@@ -1119,75 +1179,128 @@ void removeNIUnderDirs(const std::string& rootPaths)
 
 ni_error_e removeNIUnderPkgRoot(const std::string& pkgId)
 {
+       std::vector<std::string> paths;
+
        std::string rootPath = getRootPath(pkgId);
        if (rootPath.empty()) {
                _SERR("Failed to get root path from [%s]", pkgId.c_str());
                return NI_ERROR_INVALID_PACKAGE;
        }
 
-       __pm->setAppRootPath(rootPath);
-
-       // getAppNIPaths returns bin/.native_image, lib/.native_image and .tac_symlink.
-       std::string appNIPaths = __pm->getAppNIPaths();
-       std::vector<std::string> paths;
-       splitPath(appNIPaths, paths);
-       for (const auto &path : paths) {
-               if (!isReadOnlyArea(path)) {
-                       // Only the native image inside the TAC should be removed.
-                       if (strstr(path.c_str(), TAC_SYMLINK_SUB_DIR) != NULL) {
+       if (isRPK(pkgId)) {
+               std::string rpkPaths = getResourcePaths(rootPath);
+               if (rpkPaths.empty()) {
+                       _SERR("Failed to get rpk path from [%s]", pkgId.c_str());
+                       return NI_ERROR_UNKNOWN;
+               }
+               splitPath(rpkPaths, paths);
+               for (const auto &path : paths) {
+                       if (isDirectory(path)) {
                                removeNIUnderDirs(path);
-                       } else {
-                               if (isDirectory(path)) {
-                                       if (!removeAll(path.c_str())) {
-                                               _SERR("Failed to remove app ni dir [%s]", path.c_str());
+                       }
+               }
+       } else {
+               __pm->setAppRootPath(rootPath);
+
+               // getAppNIPaths returns bin/.native_image, lib/.native_image and .tac_symlink.
+               std::string appNIPaths = __pm->getAppNIPaths();
+               splitPath(appNIPaths, paths);
+               for (const auto &path : paths) {
+                       if (!isReadOnlyArea(path)) {
+                               // Only the native image inside the TAC should be removed.
+                               if (strstr(path.c_str(), TAC_SYMLINK_SUB_DIR) != NULL) {
+                                       removeNIUnderDirs(path);
+                               } else {
+                                       if (isDirectory(path)) {
+                                               if (!removeAll(path.c_str())) {
+                                                       _SERR("Failed to remove app ni dir [%s]", path.c_str());
+                                               }
                                        }
                                }
                        }
                }
-       }
 
-       // In special cases, the ni file may exist in the dll location.
-       // The code below is to avoid this exceptional case.
-       std::string appPaths = __pm->getAppPaths();
-       splitPath(appPaths, paths);
-       for (const auto &path : paths) {
-               if (isDirectory(path)) {
-                       removeNIUnderDirs(path);
+               // In special cases, the ni file may exist in the dll location.
+               // The code below is to avoid this exceptional case.
+               std::string appPaths = __pm->getAppPaths();
+               splitPath(appPaths, paths);
+               for (const auto &path : paths) {
+                       if (isDirectory(path)) {
+                               removeNIUnderDirs(path);
+                       }
                }
        }
 
        return NI_ERROR_NONE;
 }
 
-ni_error_e regenerateAppNI(NIOption* opt)
+ni_error_e regeneratePkgNI(NIOption* opt)
 {
-       int ret = 0;
-       pkgmgrinfo_appinfo_metadata_filter_h handle;
+       std::vector<std::string> pkgList;
+       ni_error_e ret = NI_ERROR_NONE;
 
-       ret = pkgmgrinfo_appinfo_metadata_filter_create(&handle);
-       if (ret != PMINFO_R_OK)
-               return NI_ERROR_UNKNOWN;
+       // iterates for Packages's metadata (RPK)
+       pkgmgrinfo_pkginfo_metadata_filter_h pkgHandle;
+       if (pkgmgrinfo_pkginfo_metadata_filter_create(&pkgHandle) == PMINFO_R_OK) {
+               if (pkgmgrinfo_pkginfo_metadata_filter_add(pkgHandle, AOT_METADATA_KEY, METADATA_VALUE_TRUE) == PMINFO_R_OK) {
+                       if (pkgmgrPkgMDFilterForeach(pkgHandle, pkgAotCb, &pkgList) != 0) {
+                               ret = NI_ERROR_UNKNOWN;
+                               _ERR("pkgmgrPkgMDFilterForeach failed");
+                       }
+               } else {
+                       ret = NI_ERROR_UNKNOWN;
+                       _ERR("pkgmgrinfo_pkginfo_metadata_filter_add failed");
+               }
+               pkgmgrinfo_pkginfo_metadata_filter_destroy(pkgHandle);
+       } else {
+               ret = NI_ERROR_UNKNOWN;
+               _ERR("pkgmgrinfo_pkginfo_metadata_filter_create failed");
+       }
 
-       ret = pkgmgrinfo_appinfo_metadata_filter_add(handle, AOT_METADATA_KEY, METADATA_VALUE);
-       if (ret != PMINFO_R_OK) {
-               pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
-               return NI_ERROR_UNKNOWN;
+       // iterate for App's metadata
+       pkgmgrinfo_appinfo_metadata_filter_h appHandle;
+       if (pkgmgrinfo_appinfo_metadata_filter_create(&appHandle) == PMINFO_R_OK) {
+               if (pkgmgrinfo_appinfo_metadata_filter_add(appHandle, AOT_METADATA_KEY, METADATA_VALUE_TRUE) == PMINFO_R_OK) {
+                       if (pkgmgrAppMDFilterForeach(appHandle, appAotCb, &pkgList) != 0) {
+                               ret = NI_ERROR_UNKNOWN;
+                               _ERR("pkgmgrAppMDFilterForeach failed");
+                       }
+               } else {
+                       ret = NI_ERROR_UNKNOWN;
+                       _ERR("pkgmgrinfo_appinfo_metadata_filter_add failed");
+               }
+               pkgmgrinfo_appinfo_metadata_filter_destroy(appHandle);
+       } else {
+               ret = NI_ERROR_UNKNOWN;
+               _ERR("pkgmgrinfo_appinfo_metadata_filter_create failed");
        }
 
-       ret = pkgmgrMDFilterForeach(handle, appAotCb, &opt);
-       if (ret != 0) {
-               pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
-               return NI_ERROR_UNKNOWN;
+       // remove duplicated pkg in the list.
+       // If one package has multiple apps, there can be duplicate values.
+       std::sort(pkgList.begin(), pkgList.end());
+       pkgList.erase(unique(pkgList.begin(), pkgList.end()), pkgList.end());
+
+       for (auto pkg : pkgList) {
+               if (isReadOnlyPkg(pkg) && opt->flags & NI_FLAGS_SKIP_RO_APP) {
+                       continue;
+               }
+
+               if (removeAndCreateNI(pkg.c_str(), opt) != NI_ERROR_NONE) {
+                       _SERR("Failed to remove previous dlls from [%s]", pkg.c_str());
+                       ret = NI_ERROR_UNKNOWN;
+               } else {
+                       _SOUT("Complete make application to native image");
+               }
        }
 
-       pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
-       return NI_ERROR_NONE;
+       return ret;
 }
 
 // callback function of "pkgmgrinfo_appinfo_metadata_filter_foreach"
 static int regenTacCb(pkgmgrinfo_appinfo_h handle, void *userData)
 {
        char *pkgId = NULL;
+       char *root = NULL;
        NIOption **pOpt = (NIOption**)userData;
 
        int ret = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgId);
@@ -1196,6 +1309,18 @@ static int regenTacCb(pkgmgrinfo_appinfo_h handle, void *userData)
                return -1;
        }
 
+       ret = pkgmgrinfo_appinfo_get_root_path(handle, &root);
+       if (ret != PMINFO_R_OK) {
+               _SERR("Failed to get root path");
+               return -1;
+       }
+
+       std::string binPath = concatPath(std::string(root), "bin");
+       if (exist(concatPath(binPath, PRE_COMPILED_PACKAGE_FILE))) {
+               _INFO("The %s is a Pre-Compiled package. So, skip the TAC", pkgId);
+               return 0;
+       }
+
        sqlite3 *tac_db = openDB(TAC_APP_LIST_DB);
        if (!tac_db) {
                _SERR("Sqlite open error");
@@ -1237,13 +1362,13 @@ ni_error_e regenerateTACNI(NIOption* opt)
                return NI_ERROR_UNKNOWN;
        }
 
-       ret = pkgmgrinfo_appinfo_metadata_filter_add(handle, TAC_METADATA_KEY, METADATA_VALUE);
+       ret = pkgmgrinfo_appinfo_metadata_filter_add(handle, TAC_METADATA_KEY, METADATA_VALUE_TRUE);
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
                return NI_ERROR_UNKNOWN;
        }
 
-       ret = pkgmgrMDFilterForeach(handle, regenTacCb, &opt);
+       ret = pkgmgrAppMDFilterForeach(handle, regenTacCb, &opt);
        if (ret != 0) {
                pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
                return NI_ERROR_UNKNOWN;
@@ -1254,124 +1379,3 @@ ni_error_e regenerateTACNI(NIOption* opt)
        return NI_ERROR_NONE;
 }
 
-static std::vector<uid_t> getUserIds()
-{
-       std::vector<uid_t> list;
-
-       while (true) {
-               errno = 0; // so we can distinguish errors from no more entries
-               passwd* entry = getpwent();
-               if (!entry) {
-                       if (errno) {
-                               _SERR("Error while getting userIDs");
-                               list.clear();
-                               return list;
-                       }
-                       break;
-               }
-               list.push_back(entry->pw_uid);
-       }
-       endpwent();
-
-       return list;
-}
-
-static std::string getAppDataPath(const std::string& pkgId, uid_t uid)
-{
-       std::string pDataFile;
-
-       tzplatform_set_user(uid);
-
-       const char* tzUserApp = tzplatform_getenv(TZ_USER_APP);
-       if (tzUserApp != NULL) {
-               pDataFile = std::string(tzUserApp) + "/" + pkgId + "/data/";
-       }
-
-       tzplatform_reset_user();
-
-       return pDataFile;
-}
-
-ni_error_e removeAppProfileData(const std::string& pkgId)
-{
-       if (pkgId.empty()) {
-               return NI_ERROR_INVALID_PARAMETER;
-       }
-
-       std::vector<uid_t> uidList = getUserIds();
-       for (auto& uid : uidList) {
-               // get data path from pkgid
-               std::string dataPath = getAppDataPath(pkgId, uid);
-               if (!dataPath.empty() && exist(dataPath)) {
-                       std::string pDataFile = dataPath + PROFILE_BASENAME;
-
-                       if (exist(pDataFile)) {
-                               if (!removeFile(pDataFile)) {
-                                       _SERR("Fail to remove profile data file (%s).", pDataFile.c_str());
-                                       return NI_ERROR_UNKNOWN;
-                               }
-                               _SOUT("Profile data (%s) is removed successfully", pDataFile.c_str());
-                       }
-               }
-       }
-
-       return NI_ERROR_NONE;
-}
-
-static int appTypeListCb(pkgmgrinfo_appinfo_h handle, void *user_data)
-{
-       char *pkgId = NULL;
-       int ret = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgId);
-       if (ret != PMINFO_R_OK || pkgId == NULL) {
-               _SERR("Fail to get pkgid");
-               return 0;
-       }
-
-       if (removeAppProfileData(pkgId) != NI_ERROR_NONE) {
-               _SERR("Fail to remove profile data for (%s)", pkgId);
-       }
-
-       return 0;
-}
-
-static ni_error_e removeAppProfileByAppType(const char* type)
-{
-       int ret;
-
-       pkgmgrinfo_appinfo_filter_h filter;
-
-       ret = pkgmgrinfo_appinfo_filter_create(&filter);
-       if (ret != PMINFO_R_OK) {
-               _SERR("Fail to create appinfo filter");
-               return NI_ERROR_UNKNOWN;
-       }
-
-       ret = pkgmgrinfo_appinfo_filter_add_string(filter, PMINFO_APPINFO_PROP_APP_TYPE, type);
-       if (ret != PMINFO_R_OK) {
-               pkgmgrinfo_appinfo_filter_destroy(filter);
-               _SERR("Fail to add appinfo filter (%s)", type);
-               return NI_ERROR_UNKNOWN;
-       }
-
-       ret = pkgmgrinfo_appinfo_filter_foreach_appinfo(filter, appTypeListCb, NULL);
-       if (ret != PMINFO_R_OK) {
-               _SERR("Fail to pkgmgrinfo_pkginfo_filter_foreach_pkginfo");
-               pkgmgrinfo_appinfo_filter_destroy(filter);
-               return NI_ERROR_UNKNOWN;
-       }
-
-       pkgmgrinfo_appinfo_filter_destroy(filter);
-
-       return NI_ERROR_NONE;
-}
-
-void removeAllAppProfileData()
-{
-       std::vector<const char*> appTypeList = {"dotnet", "dotnet-nui", "dotnet-inhouse"};
-
-       for (auto& type : appTypeList) {
-               if (removeAppProfileByAppType(type) != NI_ERROR_NONE) {
-                       _SERR("Fail to removeAppProfileByAppType for type (%s)", type);
-               }
-       }
-}