From 9cb0b5b5cce2be8cc552e21c73e7b494517a0415 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 2 Sep 2021 12:58:04 +0900 Subject: [PATCH] halapi: Use /usr/lib path in case of backend is tbm or tdm Change-Id: I2f71b0fe1b52116501c4787313905db93b933c71 --- packaging/hal-api.json | 8 ++++---- src/hal-api-list.h | 8 ++++---- tests/unittest/test_hal.cc | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packaging/hal-api.json b/packaging/hal-api.json index fe30ac6..5da2b33 100644 --- a/packaging/hal-api.json +++ b/packaging/hal-api.json @@ -7,8 +7,8 @@ "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", + "library_name" :"/usr/lib/libhal-backend-tbm.so", + "library_name_64bit" :"/usr/lib/libhal-backend-tbm.so", "symbol_name" :"hal_backend_tbm_data", "abi_versions" :[ { @@ -22,8 +22,8 @@ "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", + "library_name" :"/usr/lib/libhal-backend-tdm.so", + "library_name_64bit" :"/usr/lib/libhal-backend-tdm.so", "symbol_name" :"hal_backend_tdm_data", "abi_versions" :[ { diff --git a/src/hal-api-list.h b/src/hal-api-list.h index f86b50f..6cc990c 100644 --- a/src/hal-api-list.h +++ b/src/hal-api-list.h @@ -277,8 +277,8 @@ static struct __hal_module_info g_hal_module_info[] = { .license = HAL_LICENSE_MIT, .module_name = "HAL_MODULE_TBM", .backend_module_name = "tbm", - .library_name = "/hal/lib/libhal-backend-tbm.so", - .library_name_64bit = "/hal/lib64/libhal-backend-tbm.so", + .library_name = "/usr/lib/libhal-backend-tbm.so", + .library_name_64bit = "/usr/lib/libhal-backend-tbm.so", .symbol_name = "hal_backend_tbm_data", .num_abi_versions = ARRAY_SIZE(abi_version_match_data[HAL_MODULE_TBM]), .abi_versions = abi_version_match_data[HAL_MODULE_TBM], @@ -290,8 +290,8 @@ static struct __hal_module_info g_hal_module_info[] = { .license = HAL_LICENSE_MIT, .module_name = "HAL_MODULE_TDM", .backend_module_name = "tdm", - .library_name = "/hal/lib/libhal-backend-tdm.so", - .library_name_64bit = "/hal/lib64/libhal-backend-tdm.so", + .library_name = "/usr/lib/libhal-backend-tdm.so", + .library_name_64bit = "/usr/lib/libhal-backend-tdm.so", .symbol_name = "hal_backend_tdm_data", .num_abi_versions = ARRAY_SIZE(abi_version_match_data[HAL_MODULE_TDM]), .abi_versions = abi_version_match_data[HAL_MODULE_TDM], diff --git a/tests/unittest/test_hal.cc b/tests/unittest/test_hal.cc index f893c09..e3ad9f1 100644 --- a/tests/unittest/test_hal.cc +++ b/tests/unittest/test_hal.cc @@ -100,8 +100,8 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, HalInfoMatchedTest, ::testing::Values( HalInfo(HAL_MODULE_TBM, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, - "HAL_MODULE_TBM", "/hal/lib/libhal-backend-tbm.so", - "/hal/lib64/libhal-backend-tbm.so", "hal_backend_tbm_data", + "HAL_MODULE_TBM", "/usr/lib/libhal-backend-tbm.so", + "/usr/lib/libhal-backend-tbm.so", "hal_backend_tbm_data", vector{{ .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 @@ -109,8 +109,8 @@ INSTANTIATE_TEST_CASE_P(CommonHaltest, ), HalInfo(HAL_MODULE_TDM, HAL_GROUP_GRAPHICS, HAL_LICENSE_MIT, - "HAL_MODULE_TDM", "/hal/lib/libhal-backend-tdm.so", - "/hal/lib64/libhal-backend-tdm.so", "hal_backend_tdm_data", + "HAL_MODULE_TDM", "/usr/lib/libhal-backend-tdm.so", + "/usr/lib/libhal-backend-tdm.so", "hal_backend_tdm_data", vector{{ .platform_abi_version = HAL_ABI_VERSION_TIZEN_6_5, .backend_min_abi_version = HAL_ABI_VERSION_TIZEN_6_5 -- 2.34.1