From 8d2c5927106bcb469028b40b50b45470e3fee352 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Tue, 22 Mar 2022 20:02:55 +0900 Subject: [PATCH] halapi: common: Remove unused json-c dependency Change-Id: I38a9f5d183e46f2ebee8504d5b2f06f98d79f8b1 Signed-off-by: Chanwoo Choi --- CMakeLists.txt | 2 - packaging/hal-api-common.spec | 1 - packaging/hal-api.json | 484 ------------------------------------------ src/hal-api-conf.c | 4 - src/hal-api-conf.h | 2 - 5 files changed, 493 deletions(-) delete mode 100644 packaging/hal-api.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a318e9..5979e5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,13 +19,11 @@ SET(PKG_MODULES dlog gio-2.0 glib-2.0 - json-c ) else() SET(PKG_MODULES gio-2.0 glib-2.0 - json-c ) endif() diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec index 9889717..0163bc4 100644 --- a/packaging/hal-api-common.spec +++ b/packaging/hal-api-common.spec @@ -26,7 +26,6 @@ BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(systemd) diff --git a/packaging/hal-api.json b/packaging/hal-api.json deleted file mode 100644 index fe30ac6..0000000 --- a/packaging/hal-api.json +++ /dev/null @@ -1,484 +0,0 @@ -{ - "PLATFORM_ABI_VERSION" :"HAL_ABI_VERSION_TIZEN_6_5", - "MODULE_INFO" : - [ - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_TBM", - "backend_module" :"tbm", - "license" :"MIT", - "library_name" :"/hal/lib/libhal-backend-tbm.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-tbm.so", - "symbol_name" :"hal_backend_tbm_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_TDM", - "backend_module" :"tdm", - "license" :"MIT", - "library_name" :"/hal/lib/libhal-backend-tdm.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-tdm.so", - "symbol_name" :"hal_backend_tdm_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_COREGL", - "backend_module" :null, - "license" :"UNKNOWN", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_GRAPHICS", - "module" :"HAL_MODULE_INPUT", - "backend_module" :null, - "license" :"MIT", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_AUDIO", - "backend_module" :"audio", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-audio.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-audio.so", - "symbol_name" :"hal_backend_audio_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_CAMERA", - "backend_module" :"camera", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-camera.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-camera.so", - "symbol_name" :"hal_backend_camera_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_RADIO", - "backend_module" :"radio", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-radio.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-radio.so", - "symbol_name" :"hal_backend_radio_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_CODEC", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_USB_AUDIO", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_MULTIMEDIA", - "module" :"HAL_MODULE_ALSAUCM", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_BLUETOOTH", - "backend_module" :"bluetooth", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-bluetooth.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-bluetooth.so", - "symbol_name" :"hal_backend_bluetooth_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_WIFI", - "backend_module" :"wifi", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-wifi.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-wifi.so", - "symbol_name" :"hal_backend_wifi_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_NAN", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_NFC", - "backend_module" :"nfc", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-nfc.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-nfc.so", - "symbol_name" :"hal_backend_nfc_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_ZIGBEE", - "backend_module" :"zigbee", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-zigbee.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-zigbee.so", - "symbol_name" :"hal_backend_zigbee_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_UWB", - "backend_module" :"uwb", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-uwb.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-uwb.so", - "symbol_name" :"hal_backend_uwb_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_CONNECTIVITY", - "module" :"HAL_MODULE_MTP", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - - { - "group" :"HAL_GROUP_TELEPHONY", - "module" :"HAL_MODULE_TELEPHONY", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_LOCATION", - "module" :"HAL_MODULE_LOCATION", - "backend_module" :"location", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-location.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-location.so", - "symbol_name" :"hal_backend_location_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_COMMON", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_POWER", - "backend_module" :"power", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-power.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-power.so", - "symbol_name" :"hal_backend_power_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_SENSOR", - "backend_module" :"sensor", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-sensor.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-sensor.so", - "symbol_name" :"hal_backend_sensor_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_PERIPHERAL", - "backend_module" :null, - "license" :"APACHE_2_0", - "library_name" :null, - "library_name_64bit" :null, - "symbol_name" :null, - "abi_versions" :null - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_BATTERY", - "backend_module" :"device-battery", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-battery.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-battery.so", - "symbol_name" :"hal_backend_device_battery_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_BEZEL", - "backend_module" :"device-bezel", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-bezel.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-bezel.so", - "symbol_name" :"hal_backend_device_bezel_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_DISPLAY", - "backend_module" :"device-display", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-display.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-display.so", - "symbol_name" :"hal_backend_device_display_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_IR", - "backend_module" :"device-ir", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-ir.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-ir.so", - "symbol_name" :"hal_backend_device_ir_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_TOUCHSCREEN", - "backend_module" :"device-touchscreen", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-touchscreen.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-touchscreen.so", - "symbol_name" :"hal_backend_device_touchscreen_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_LED", - "backend_module" :"device-led", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-led.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-led.so", - "symbol_name" :"hal_backend_device_led_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_BOARD", - "backend_module" :"device-board", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-board.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-board.so", - "symbol_name" :"hal_backend_device_board_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_EXTERNAL_CONNECTION", - "backend_module" :"device-external-connection", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-external-connection.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-external-connection.so", - "symbol_name" :"hal_backend_device_external_connection_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_THERMAL", - "backend_module" :"device-thermal", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-thermal.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-thermal.so", - "symbol_name" :"hal_backend_device_thermal_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_USB_GADGET", - "backend_module" :"device-usb-gadget", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-usb-gadget.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-usb-gadget.so", - "symbol_name" :"hal_backend_device_usb_gadget_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_HAPTIC", - "backend_module" :"device-haptic", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-haptic.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-haptic.so", - "symbol_name" :"hal_backend_device_haptic_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - }, - { - "group" :"HAL_GROUP_SYSTEM", - "module" :"HAL_MODULE_DEVICE_MEMORY", - "backend_module" :"device-memory", - "license" :"APACHE_2_0", - "library_name" :"/hal/lib/libhal-backend-device-memory.so", - "library_name_64bit" :"/hal/lib64/libhal-backend-device-memory.so", - "symbol_name" :"hal_backend_device_memory_data", - "abi_versions" :[ - { - "platform_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5", - "backend_min_abi_version" :"HAL_ABI_VERSION_TIZEN_6_5" - } - ] - } - ] -} diff --git a/src/hal-api-conf.c b/src/hal-api-conf.c index c79e7de..a3c6c25 100644 --- a/src/hal-api-conf.c +++ b/src/hal-api-conf.c @@ -19,9 +19,6 @@ #include #include -#include -#include - #include "hal-common.h" #include "hal-common-interface.h" @@ -65,7 +62,6 @@ static struct __hal_module_info* _get_module_info_with_library_name(enum hal_mod const char *library_name) { struct __hal_module_info *info = NULL, *new_info = NULL, *tmp_info = NULL; - json_object *module_array_object = NULL; const char *group_name = NULL; const char *module_name = NULL; char *library_name_prefix = NULL; diff --git a/src/hal-api-conf.h b/src/hal-api-conf.h index a87f76a..e77edc0 100644 --- a/src/hal-api-conf.h +++ b/src/hal-api-conf.h @@ -26,8 +26,6 @@ extern "C" { #endif -#define HAL_CONFIGURATION_PATH "/etc/hal/hal-api.json" - int _hal_api_conf_init(void); void _hal_api_conf_exit(void); -- 2.7.4