Remove a dependency of capi-appfw-app-common package

This patch uses aul_get_app_data_path() instead of app_get_data_path().

Change-Id: If417eb9733be76850eb22d39f7c48c3716379633
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/NativeLauncher/CMakeLists.txt b/NativeLauncher/CMakeLists.txt
index 873441e..019d031 100644 (file)
--- a/NativeLauncher/CMakeLists.txt
+++ b/NativeLauncher/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT("dotnet-tools")
 MESSAGE("CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(${PROJECT_NAME} REQUIRED aul pkgmgr-info pkgmgr-installer bundle dlog liblaunchpad glib-2.0 libsmack capi-appfw-app-common jsoncpp openssl3 sqlite3 libtzplatform-config)
+PKG_CHECK_MODULES(${PROJECT_NAME} REQUIRED aul pkgmgr-info pkgmgr-installer bundle dlog liblaunchpad glib-2.0 libsmack jsoncpp openssl3 sqlite3 libtzplatform-config)
 
 FOREACH(flag ${${PROJECT_NAME}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/NativeLauncher/launcher/lib/core_runtime.cc b/NativeLauncher/launcher/lib/core_runtime.cc
index 86ea664..39c3695 100644 (file)
--- a/NativeLauncher/launcher/lib/core_runtime.cc
+++ b/NativeLauncher/launcher/lib/core_runtime.cc
@@ -36,7 +36,7 @@
 #include <pthread.h>
 
 #include <vconf.h>
-#include <app_common.h>
+#include <aul.h>
 #include <tzplatform_config.h>
 
 #include "injection.h"
@@ -528,7 +528,7 @@ int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
 
        // set application data path to coreclr environment.
        // application data path can be changed by owner. So, we have to set data path just before launching.
-       char* localDataPath = app_get_data_path();
+       const char* localDataPath = aul_get_app_data_path();
        if (localDataPath != nullptr) {
                setEnvironmentVariable("XDG_DATA_HOME", localDataPath);
 
@@ -559,7 +559,6 @@ int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
                                _INFO("MCJ recording start for %s", appId);
                        }
                }
-               free(localDataPath);
        }
 
        if (exist(__pm->getAppRootPath() + "/bin/" + DISABLE_IPV6_FILE)) {

diff --git a/NativeLauncher/tool/dotnettool.cc b/NativeLauncher/tool/dotnettool.cc
index 3e43773..39b5206 100644 (file)
--- a/NativeLauncher/tool/dotnettool.cc
+++ b/NativeLauncher/tool/dotnettool.cc
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <app_common.h>
 
 void DisplayUsage() {
        _SOUT(

diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index f24af70..20b0899 100644 (file)
--- a/packaging/dotnet-launcher.spec
+++ b/packaging/dotnet-launcher.spec
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(pkgmgr-info)
 BuildRequires: pkgconfig(pkgmgr-installer)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libsmack)
-BuildRequires: pkgconfig(capi-appfw-app-common)
 BuildRequires: pkgconfig(jsoncpp)
 BuildRequires: pkgconfig(openssl3)
 BuildRequires: pkgconfig(libsystemd)