Review and rebase changes

diff --git a/NativeLauncher/inc/ni_common.h b/NativeLauncher/inc/ni_common.h
index 3c43a57..9483ece 100644 (file)
--- a/NativeLauncher/inc/ni_common.h
+++ b/NativeLauncher/inc/ni_common.h
@@ -62,6 +62,7 @@ void createNiPlatform(bool enableR2R, bool doGenUniqueBaseSystem);
  * @brief create native image for specific dll with file path.
  * @param[i] dllPath file path to generate native image
  * @param[i] enableR2R enable ready-to-run mode
+ * @param[i] doGenUniqueBaseSystem flag whether to generate unique default base address
  * @return ni_error_e
  */
 ni_error_e createNiDll(const std::string& dllPath, bool enableR2R, bool doGenUniqueBaseSystem);
@@ -71,6 +72,7 @@ ni_error_e createNiDll(const std::string& dllPath, bool enableR2R, bool doGenUni
  * @param[i] rootPaths directories whicn contains DLLs
  * @param[i] count number of rootPath
  * @param[i] enableR2R enable ready-to-run mode
+ * @param[i] doGenUniqueBaseSystem flag whether to generate unique default base address
  * @param[i] isAppNI if you want to create ni files under nativeImage directory, set it true
  */
 void createNiUnderDirs(const std::string rootPaths[], int count, bool enableR2R, bool doGenUniqueBaseSystem, bool isAppNI = false);

diff --git a/NativeLauncher/installer-plugin/prefer_dotnet_aot_plugin.cc b/NativeLauncher/installer-plugin/prefer_dotnet_aot_plugin.cc
index 0ba9d90..1c1968f 100644 (file)
--- a/NativeLauncher/installer-plugin/prefer_dotnet_aot_plugin.cc
+++ b/NativeLauncher/installer-plugin/prefer_dotnet_aot_plugin.cc
@@ -83,7 +83,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                                        std::string originPath = bf::read_symlink(symPath).string();
                                        std::string originNiPath = originPath.substr(0, originPath.rfind(".dll")) + ".ni.dll";
                                        if (!bf::exists(originNiPath)) {
-                                               if(createNiDll(originPath, false) != NI_ERROR_NONE) {
+                                               if(createNiDll(originPath, false, false) != NI_ERROR_NONE) {
                                                        _ERR("Failed to create NI file [%s]\n", originPath.c_str());
                                                        return -1;
                                                }

diff --git a/NativeLauncher/tool/ni_common.cc b/NativeLauncher/tool/ni_common.cc
index fd366f0..79fa9f4 100644 (file)
--- a/NativeLauncher/tool/ni_common.cc
+++ b/NativeLauncher/tool/ni_common.cc
@@ -50,7 +50,7 @@
 
 #ifdef UNIQUE_DEFAULT_BASE_ADDR_SUPPORT
 #define SYSTEM_BASE_FILE "/usr/share/dotnet.tizen/system.base.addr.txt"
-#define DEFAULT_BASE_ADDR_START 0x1000000
+#define DEFAULT_BASE_ADDR_START 0x3000000
 #endif
 
 #define __XSTR(x) #x