diff --git a/adapter/uhdf2/hdi.gni b/adapter/uhdf2/hdi.gni index 5977158375e3455d5525f4481a8b8655649fcd30..fb6bd179153099cc09fe71d40384329ba9e8d040 100644 --- a/adapter/uhdf2/hdi.gni +++ b/adapter/uhdf2/hdi.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2023 Huawei Device Co., Ltd. +# Copyright (c) 2021-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -102,16 +102,7 @@ template("hdi") { idl_headers_config = "$target_name" + "_idl_headers_config" config("$idl_headers_config") { - include_dirs = [ - "$hdf_uhdf_path/include/hdi", - "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/ipc/include", - "$hdf_framework_path/include/utils", - "//drivers/hdf_core/interfaces/inner_api/utils", - "//drivers/hdf_core/interfaces/inner_api/osal/uhdf", - "//drivers/hdf_core/interfaces/inner_api/hdi", - ] - include_dirs += hdi_build_info.include_dirs + include_dirs = hdi_build_info.include_dirs } action("hdi_gen") { @@ -164,6 +155,8 @@ template("hdi") { external_deps = [ "c_utils:utils", + "hdf_core:libhdf_ipc_adapter", + "hdf_core:libhdf_utils", "hdf_core:libhdi", "hdf_core:libpub_utils", "hilog:libhilog", @@ -171,9 +164,7 @@ template("hdi") { if (defined(invoker.sequenceable_ext_deps)) { external_deps += invoker.sequenceable_ext_deps } - if (invoker.language == "c") { - external_deps += [ "hdf_core:libhdf_ipc_adapter" ] - } else if (invoker.language == "cpp") { + if (invoker.language == "cpp") { external_deps += [ "ipc:ipc_single" ] } } else { @@ -234,18 +225,15 @@ template("hdi") { external_deps = [ "c_utils:utils", + "hdf_core:libhdf_ipc_adapter", + "hdf_core:libhdf_utils", "hdf_core:libhdi", "hilog:libhilog", ] if (defined(invoker.sequenceable_ext_deps)) { external_deps += invoker.sequenceable_ext_deps } - if (invoker.language == "c") { - external_deps += [ - "hdf_core:libhdf_ipc_adapter", - "hdf_core:libhdf_utils", - ] - } else if (invoker.language == "cpp") { + if (invoker.language == "cpp") { external_deps += [ "ipc:ipc_single" ] } } else { diff --git a/adapter/uhdf2/ipc/include/iproxy_broker.h b/interfaces/inner_api/ipc/iproxy_broker.h similarity index 100% rename from adapter/uhdf2/ipc/include/iproxy_broker.h rename to interfaces/inner_api/ipc/iproxy_broker.h