From 8488668fc71113dd1fd10e72fbcad6087188cbdb Mon Sep 17 00:00:00 2001 From: j30052480 Date: Tue, 28 May 2024 14:19:24 +0800 Subject: [PATCH 1/2] feat: remove include dirs in hdi.gni Signed-off-by: j30052480 --- adapter/uhdf2/hdi.gni | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/adapter/uhdf2/hdi.gni b/adapter/uhdf2/hdi.gni index 597715837..b708824ac 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") { -- Gitee From cc7f22437f5d6465b220208c2eddf4b7cfac50e3 Mon Sep 17 00:00:00 2001 From: j30052480 Date: Wed, 29 May 2024 11:17:53 +0800 Subject: [PATCH 2/2] feat: remove include dirs in hdi.gni Signed-off-by: j30052480 --- adapter/uhdf2/hdi.gni | 15 ++++++--------- .../inner_api/ipc}/iproxy_broker.h | 0 2 files changed, 6 insertions(+), 9 deletions(-) rename {adapter/uhdf2/ipc/include => interfaces/inner_api/ipc}/iproxy_broker.h (100%) diff --git a/adapter/uhdf2/hdi.gni b/adapter/uhdf2/hdi.gni index b708824ac..fb6bd1791 100644 --- a/adapter/uhdf2/hdi.gni +++ b/adapter/uhdf2/hdi.gni @@ -155,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", @@ -162,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 { @@ -225,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 -- Gitee