mirror of
https://gitee.com/openharmony/telephony_ril_adapter
synced 2024-11-30 11:20:46 +00:00
!356 change telephony_ril_adapter utils native path to commonlibrary c_utils
Merge pull request !356 from Leon/orichange
This commit is contained in:
commit
1a95afab4d
@ -55,7 +55,7 @@ ohos_shared_library("hril_innerkits") {
|
||||
"LOG_DOMAIN = 0xD001F08",
|
||||
]
|
||||
|
||||
external_deps = [ "utils_base:utils" ]
|
||||
external_deps = [ "c_utils:utils" ]
|
||||
|
||||
if (is_standard_system) {
|
||||
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
|
||||
|
@ -58,7 +58,7 @@ ohos_shared_library("hril") {
|
||||
"ipc:ipc_core",
|
||||
]
|
||||
|
||||
public_deps = [ "//utils/native/base:utils" ]
|
||||
public_deps = [ "//commonlibrary/c_utils/base:utils" ]
|
||||
|
||||
if (is_standard_system) {
|
||||
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
|
||||
|
@ -34,10 +34,12 @@ ohos_shared_library("hril_hdf") {
|
||||
"${hdf_uhdf_path}/ipc:libhdf_ipc_adapter",
|
||||
"${hdf_uhdf_path}/utils:libhdf_utils",
|
||||
"//base/hiviewdfx/faultloggerd/interfaces/innerkits/signal_handler:dfx_signalhandler",
|
||||
"//utils/native/base:utils",
|
||||
]
|
||||
|
||||
external_deps = [ "init:libbegetutil" ]
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"init:libbegetutil",
|
||||
]
|
||||
defines = [
|
||||
"LOG_TAG = \"HrilHdf\"",
|
||||
"LOG_DOMAIN = 0xD001F08",
|
||||
|
10
services/vendor/BUILD.gn
vendored
10
services/vendor/BUILD.gn
vendored
@ -36,12 +36,12 @@ ohos_shared_library("ril_vendor") {
|
||||
"LOG_TAG = \"RilVendor\"",
|
||||
"LOG_DOMAIN = 0xD001F08",
|
||||
]
|
||||
deps = [
|
||||
"//base/telephony/ril_adapter/interfaces/innerkits:hril_innerkits",
|
||||
"//utils/native/base:utils",
|
||||
]
|
||||
deps = [ "//base/telephony/ril_adapter/interfaces/innerkits:hril_innerkits" ]
|
||||
|
||||
external_deps = [ "init:libbegetutil" ]
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"init:libbegetutil",
|
||||
]
|
||||
|
||||
if (is_standard_system) {
|
||||
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
|
||||
|
@ -51,7 +51,7 @@ ohos_executable("ril_adapter_test") {
|
||||
"ril_adapter:hril_innerkits",
|
||||
]
|
||||
|
||||
public_deps = [ "//utils/native/base:utils" ]
|
||||
public_deps = [ "//commonlibrary/c_utils/base:utils" ]
|
||||
|
||||
if (is_standard_system) {
|
||||
external_deps += [ "hiviewdfx_hilog_native:libhilog" ]
|
||||
|
@ -32,7 +32,7 @@ ohos_unittest("tel_ril_adapter_gtest") {
|
||||
|
||||
include_dirs = [
|
||||
"//base/telephony/ril_adapter/services/hril/include",
|
||||
"//utils/native/base/include",
|
||||
"//commonlibrary/c_utils/base/include",
|
||||
"//third_party/json/include",
|
||||
"//drivers/hdf_core/adapter/uhdf2/include/hdi",
|
||||
"include",
|
||||
@ -46,10 +46,10 @@ ohos_unittest("tel_ril_adapter_gtest") {
|
||||
"//drivers/hdf_core/adapter/uhdf2/ipc:libhdf_ipc_adapter",
|
||||
"//drivers/hdf_core/adapter/uhdf2/utils:libhdf_utils",
|
||||
"//third_party/googletest:gtest_main",
|
||||
"//utils/native/base:utils",
|
||||
]
|
||||
|
||||
external_deps = [
|
||||
"c_utils:utils",
|
||||
"eventhandler:libeventhandler",
|
||||
"ipc:ipc_core",
|
||||
"ril_adapter:hril_innerkits",
|
||||
|
Loading…
Reference in New Issue
Block a user