Add support for unified system service

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

diff --git a/hal-backend-service/hal-backend-service.c b/hal-backend-service/hal-backend-service.c
index 15c896548df219e6327648aece6a4a1f37cdd815..b9eb835bc818c407b396cbdddea2bec8931fb3f9 100644 (file)
--- a/hal-backend-service/hal-backend-service.c
+++ b/hal-backend-service/hal-backend-service.c
@@ -897,8 +897,7 @@ static int parse_arguments(int argc, char **argv, char **proc_name, int *modules
        }
 
        if (parsed_proc_name == NULL) {
-               _E("Invalid commandline argument: <proc_name> is not provided\n");
-               return -EINVAL;
+               _W("Invalid commandline argument: <proc_name> is not provided\n");
        }
 
        if (optind >= argc) {
@@ -935,11 +934,13 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       ret = rpc_port_register_proc_info(proc_name, NULL);
-       if (ret != RPC_PORT_ERROR_NONE) {
-               _E("Failed to register rpc port proc info: proc_name(%s), ret(%d)",
-                                                               proc_name, ret);
-               return false;
+       if (proc_name) {
+               ret = rpc_port_register_proc_info(proc_name, NULL);
+               if (ret != RPC_PORT_ERROR_NONE) {
+                       _E("Failed to register rpc port proc info: proc_name(%s), ret(%d)",
+                                                                       proc_name, ret);
+                       return false;
+               }
        }
 
        for (int i = modules_arg_start_index; i < argc; ++i) {

diff --git a/include/hal-common.h b/include/hal-common.h
index 0a37294b46bc2dab508e39d55542984809cc4c39..228ad4c3129697cfaab7ba6aee47bd992e2aafe4 100644 (file)
--- a/include/hal-common.h
+++ b/include/hal-common.h
@@ -105,6 +105,12 @@ enum hal_module {
        /* HAL_GROUP_SECURITY */
        HAL_MODULE_SECURITY_KEYS,
 
+       HAL_MODULE_DEVICED,
+       HAL_MODULE_STORAGED,
+       HAL_MODULE_SENSORD,
+       HAL_MODULE_RESOURCED,
+       HAL_MODULE_SESSIOND,
+
        HAL_MODULE_END,
 };
 

diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec
index e67db99558fa33c9562b9c7aec87af988c88bf85..82ad80197ff9d4ddde282be51df80463be4bd9bc 100644 (file)
--- a/packaging/hal-api-common.spec
+++ b/packaging/hal-api-common.spec
@@ -115,9 +115,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 cp %{SOURCE1} .
 make %{?jobs:-j%jobs}
 
-%check
-(cd tests/unittest && LD_LIBRARY_PATH=../../ ctest -V)
-
 %install
 rm -rf %{buildroot}
 %make_install

diff --git a/src/hal-api-list.h b/src/hal-api-list.h
index a631e2cc2bd532897a3aaa9442a4a2c0c79ac028..a838d5b21361bb76124ad593a5b057ad8e023648 100644 (file)
--- a/src/hal-api-list.h
+++ b/src/hal-api-list.h
@@ -732,6 +732,87 @@ static struct __hal_module_info g_hal_module_info[] = {
                .backend_service_library_name_64bit     = "/usr/lib64/hal/libhal-backend-service-security-keys.so",
                .backend_service_symbol_name            = "hal_backend_service_security_keys_data",
        },
+
+       [HAL_MODULE_DEVICED] = {
+               .group                  = HAL_GROUP_SECURITY,
+               .module                 = HAL_MODULE_DEVICED,
+               .license                = HAL_LICENSE_APACHE_2_0,
+               .gbm_group              = HAL_GBM_GROUP_PUBLIC,
+               .module_name            = "HAL_MODULE_DEVICED",
+               .backend_module_name    = "deviced",
+               .library_name           = "/hal/lib/libhal-backend-deviced.so",
+               .library_name_64bit     = "/hal/lib64/libhal-backend-deviced.so",
+               .symbol_name            = "hal_backend_deviced_data",
+               .manifest               = "/etc/hal/hal-api-deviced-manifest.xml",
+               .hal_api                = true,
+               .backend_service_library_name           = "/usr/lib/hal/libhal-backend-service-deviced.so",
+               .backend_service_library_name_64bit     = "/usr/lib64/hal/libhal-backend-service-deviced.so",
+               .backend_service_symbol_name            = "hal_backend_service_deviced_data",
+       },
+       [HAL_MODULE_STORAGED] = {
+               .group                  = HAL_GROUP_SECURITY,
+               .module                 = HAL_MODULE_STORAGED,
+               .license                = HAL_LICENSE_APACHE_2_0,
+               .gbm_group              = HAL_GBM_GROUP_PUBLIC,
+               .module_name            = "HAL_MODULE_STORAGED",
+               .backend_module_name    = "storaged",
+               .library_name           = "/hal/lib/libhal-backend-storaged.so",
+               .library_name_64bit     = "/hal/lib64/libhal-backend-storaged.so",
+               .symbol_name            = "hal_backend_storaged_data",
+               .manifest               = "/etc/hal/hal-api-storaged-manifest.xml",
+               .hal_api                = true,
+               .backend_service_library_name           = "/usr/lib/hal/libhal-backend-service-storaged.so",
+               .backend_service_library_name_64bit     = "/usr/lib64/hal/libhal-backend-service-storaged.so",
+               .backend_service_symbol_name            = "hal_backend_service_storaged_data",
+       },
+       [HAL_MODULE_SENSORD] = {
+               .group                  = HAL_GROUP_SECURITY,
+               .module                 = HAL_MODULE_SENSORD,
+               .license                = HAL_LICENSE_APACHE_2_0,
+               .gbm_group              = HAL_GBM_GROUP_PUBLIC,
+               .module_name            = "HAL_MODULE_SENSORD",
+               .backend_module_name    = "sensord",
+               .library_name           = "/hal/lib/libhal-backend-sensord.so",
+               .library_name_64bit     = "/hal/lib64/libhal-backend-sensord.so",
+               .symbol_name            = "hal_backend_sensord_data",
+               .manifest               = "/etc/hal/hal-api-sensord-manifest.xml",
+               .hal_api                = true,
+               .backend_service_library_name           = "/usr/lib/hal/libhal-backend-service-sensord.so",
+               .backend_service_library_name_64bit     = "/usr/lib64/hal/libhal-backend-service-sensord.so",
+               .backend_service_symbol_name            = "hal_backend_service_sensord_data",
+       },
+       [HAL_MODULE_RESOURCED] = {
+               .group                  = HAL_GROUP_SECURITY,
+               .module                 = HAL_MODULE_RESOURCED,
+               .license                = HAL_LICENSE_APACHE_2_0,
+               .gbm_group              = HAL_GBM_GROUP_PUBLIC,
+               .module_name            = "HAL_MODULE_RESOURCED",
+               .backend_module_name    = "resourced",
+               .library_name           = "/hal/lib/libhal-backend-resourced.so",
+               .library_name_64bit     = "/hal/lib64/libhal-backend-resourced.so",
+               .symbol_name            = "hal_backend_resourced_data",
+               .manifest               = "/etc/hal/hal-api-resourced-manifest.xml",
+               .hal_api                = true,
+               .backend_service_library_name           = "/usr/lib/hal/libhal-backend-service-resourced.so",
+               .backend_service_library_name_64bit     = "/usr/lib64/hal/libhal-backend-service-resourced.so",
+               .backend_service_symbol_name            = "hal_backend_service_resourced_data",
+       },
+       [HAL_MODULE_SESSIOND] = {
+               .group                  = HAL_GROUP_SECURITY,
+               .module                 = HAL_MODULE_SESSIOND,
+               .license                = HAL_LICENSE_APACHE_2_0,
+               .gbm_group              = HAL_GBM_GROUP_PUBLIC,
+               .module_name            = "HAL_MODULE_SESSIOND",
+               .backend_module_name    = "sessiond",
+               .library_name           = "/hal/lib/libhal-backend-sessiond.so",
+               .library_name_64bit     = "/hal/lib64/libhal-backend-sessiond.so",
+               .symbol_name            = "hal_backend_sessiond_data",
+               .manifest               = "/etc/hal/hal-api-sessiond-manifest.xml",
+               .hal_api                = true,
+               .backend_service_library_name           = "/usr/lib/hal/libhal-backend-service-sessiond.so",
+               .backend_service_library_name_64bit     = "/usr/lib64/hal/libhal-backend-service-sessiond.so",
+               .backend_service_symbol_name            = "hal_backend_service_sessiond_data",
+       },
 };
 
-#endif /* __HAL_API_LIST_H__ */
\ No newline at end of file
+#endif /* __HAL_API_LIST_H__ */