From: Chanwoo Choi Date: Tue, 20 Jul 2021 09:15:12 +0000 (+0900) Subject: halapi: Remove libtzplatform-config dependency X-Git-Tag: submit/tizen/20210721.013304~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1aa48b3533c1d4ff0b14b71e5144ffdbca95222a;p=platform%2Fhal%2Fapi%2Fcommon.git halapi: Remove libtzplatform-config dependency Change-Id: I7b57ca09374ac2648939ab4fdd415401fe7c00e2 Signed-off-by: Chanwoo Choi --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f8be43a..cc86597 100644 --- 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 42e5d49..332b249 100644 --- 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 23d1e72..a87f76a 100644 --- a/src/hal-api-conf.h +++ b/src/hal-api-conf.h @@ -20,15 +20,13 @@ #include #include -#include - #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 1700b6a..f893c09 100644 --- 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() {}