From fd4195564026e5a8da6a33d228c79080a56aa424 Mon Sep 17 00:00:00 2001 From: "j-h.choi" Date: Wed, 28 Feb 2024 11:02:16 +0900 Subject: [PATCH] Change NI generation location to root for RPK type Change-Id: Ic6696df36d3c3a9b2b15fe39e18eee8e13782c6e --- NativeLauncher/inc/ni_common.h | 1 - NativeLauncher/tool/ni_common.cc | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/NativeLauncher/inc/ni_common.h b/NativeLauncher/inc/ni_common.h index e1c7e85..28b387f 100644 --- a/NativeLauncher/inc/ni_common.h +++ b/NativeLauncher/inc/ni_common.h @@ -41,7 +41,6 @@ #define NI_FLAGS_SKIP_RO_APP 0x0400 #define NI_FLAGS_RM_ORIGIN_AFTER_NI 0x0800 #define NI_FLAGS_SET_PRIORITY 0x1000 -#define NI_FLAGS_RESOURCE_NI 0x2000 typedef std::function afterCreate; diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc index f7b69ad..cf3a02b 100644 --- a/NativeLauncher/tool/ni_common.cc +++ b/NativeLauncher/tool/ni_common.cc @@ -258,9 +258,6 @@ static std::string getNIFilePath(const std::string& absDllPath, NIOption* opt) } 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("."); @@ -470,11 +467,6 @@ static ni_error_e crossgen2PostAction(const std::string& dllPath, const std::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()); } @@ -1099,7 +1091,6 @@ ni_error_e createNIUnderPkgRoot(const std::string& pkgId, NIOption* opt) 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 std::string paths = getResourcePaths(rootPath); @@ -1110,7 +1101,6 @@ ni_error_e createNIUnderPkgRoot(const std::string& pkgId, NIOption* opt) targetDirs = paths; } else { 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; -- 2.7.4