halapi: Remove libtzplatform-config dependency

Change-Id: I7b57ca09374ac2648939ab4fdd415401fe7c00e2
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8be43ada80303611aa1a78fefa231d9cb6cb6e8..cc86597b5e6fe7a4515c6ffab4a2ce7255760d05 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ SET(PKG_MODULES
        gio-2.0
        glib-2.0
        json-c
-       libtzplatform-config
 )
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec
index 42e5d49bce72743ee809c67f2a672c6e4fba6a85..332b249950c2c61733eb2e76a8b7efa11947ba4b 100644 (file)
--- a/packaging/hal-api-common.spec
+++ b/packaging/hal-api-common.spec
@@ -28,7 +28,6 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(json-c)
 BuildRequires: pkgconfig(gmock)
-BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(systemd)
 
 %description

diff --git a/src/hal-api-conf.h b/src/hal-api-conf.h
index 23d1e72b8bcc48bfdbde1e2b4e0a4a52fa4ddf21..a87f76a69f38fcf1964ea80a9e27cb80185beb97 100644 (file)
--- a/src/hal-api-conf.h
+++ b/src/hal-api-conf.h
@@ -20,15 +20,13 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 
-#include <tzplatform_config.h>
-
 #include "hal-common-interface.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define HAL_CONFIGURATION_PATH tzplatform_mkpath(TZ_SYS_RO_ETC, "hal/hal-api.json")
+#define HAL_CONFIGURATION_PATH "/etc/hal/hal-api.json"
 
 int _hal_api_conf_init(void);
 void _hal_api_conf_exit(void);

diff --git a/tests/unittest/test_hal.cc b/tests/unittest/test_hal.cc
index 1700b6a84cf4898872854f0723ff227bbf905313..f893c098bc9688a5fdc137f552f8bd8a00ba78b2 100644 (file)
--- a/tests/unittest/test_hal.cc
+++ b/tests/unittest/test_hal.cc
@@ -32,12 +32,6 @@
 
 using namespace std;
 
-
-extern "C" const char *tzplatform_mkpath(
-   enum tzplatform_variable id, const char *path) {
-   return "../../packaging/hal-api.json";
-}
-
 class CommonHaltest : public testing::Test {
  public:
   CommonHaltest() {}