From d609b946b35b4516abeabb7d00c72d10cc04b275 Mon Sep 17 00:00:00 2001 From: zhaohang Date: Mon, 29 Jan 2024 17:29:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=20Signed-off-by:=20zhaohang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/model/network/wifi/core/module/wifi_base.c | 2 +- .../model/network/wifi/platform/src/message/nodes/local_node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/model/network/wifi/core/module/wifi_base.c b/framework/model/network/wifi/core/module/wifi_base.c index 42007fec6..b0f722a19 100644 --- a/framework/model/network/wifi/core/module/wifi_base.c +++ b/framework/model/network/wifi/core/module/wifi_base.c @@ -6,7 +6,7 @@ * See the LICENSE file in the root of this repository for complete details. */ #include "wifi_base.h" -#include "../hdf_wifi_core.h" +#include "hdf_wifi_core.h" #include "eapol.h" #include "hdf_wifi_event.h" #include "hdf_wlan_chipdriver_manager.h" diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c index 6cdfba889..4e7bc89ca 100644 --- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c +++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c @@ -10,7 +10,7 @@ #include "hdf_log.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" -#include "../message_router_inner.h" +#include "message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT -- Gitee From 467ee150e31e03f7d683d722268231f52187670d Mon Sep 17 00:00:00 2001 From: zhaohang Date: Tue, 30 Jan 2024 10:16:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?hff=5Fcore=E6=B7=BB=E5=8A=A0=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=20Signed-off-by:=20zhaohan?= =?UTF-8?q?g=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adapter/khdf/liteos/model/network/wifi/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/adapter/khdf/liteos/model/network/wifi/BUILD.gn b/adapter/khdf/liteos/model/network/wifi/BUILD.gn index 87316bf13..18f105e4c 100644 --- a/adapter/khdf/liteos/model/network/wifi/BUILD.gn +++ b/adapter/khdf/liteos/model/network/wifi/BUILD.gn @@ -73,5 +73,6 @@ hdf_driver(module_name) { "$FRAMEWORKS_WIFI_ROOT/bus", "$FRAMEWORKS_WIFI_ROOT/platform/include/message", "$FRAMEWORKS_WIFI_ROOT/platform/include", + "$FRAMEWORKS_WIFI_ROOT/platform/src/message", ] } -- Gitee From ff8fa63f541cf48d5e07f858987a7e9e9fe701fa Mon Sep 17 00:00:00 2001 From: zhaohang Date: Fri, 2 Feb 2024 15:33:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=94=B9=E9=80=A0config=5Fpolicy\hdf=5Fcor?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaohang --- adapter/khdf/liteos_m/hdi_mini.gni | 4 ++-- adapter/uhdf/hdi_small.gni | 2 +- adapter/uhdf2/hdi.gni | 2 +- framework/tools/hc-gen/hc_gen.gni | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adapter/khdf/liteos_m/hdi_mini.gni b/adapter/khdf/liteos_m/hdi_mini.gni index a0fff6ebb..2ca71e800 100644 --- a/adapter/khdf/liteos_m/hdi_mini.gni +++ b/adapter/khdf/liteos_m/hdi_mini.gni @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License.. +# limitations under the License.. import("//build/ohos.gni") import("//drivers/hdf_core/adapter/khdf/liteos_m/hdf.gni") @@ -84,7 +84,7 @@ template("hdi_mini") { } action("hdi_gen") { - deps = [ "$HDF_FRAMEWORKS_PATH/tools/hdi-gen:build_hdi_gen" ] + deps = [ "//build/zh_extral_dir/hdf_core:build_hdi_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" diff --git a/adapter/uhdf/hdi_small.gni b/adapter/uhdf/hdi_small.gni index 37640791a..9cc275792 100644 --- a/adapter/uhdf/hdi_small.gni +++ b/adapter/uhdf/hdi_small.gni @@ -85,7 +85,7 @@ template("hdi_small") { } action("hdi_gen") { - deps = [ "$hdf_framework_path/tools/hdi-gen:build_hdi_gen" ] + deps = [ "//build/zh_extral_dir/hdf_core:build_hdi_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" diff --git a/adapter/uhdf2/hdi.gni b/adapter/uhdf2/hdi.gni index ad825e20f..d86269895 100644 --- a/adapter/uhdf2/hdi.gni +++ b/adapter/uhdf2/hdi.gni @@ -110,7 +110,7 @@ template("hdi") { } action("hdi_gen") { - deps = [ "$hdf_fwk_path/tools/hdi-gen:build_hdi_gen" ] + deps = [ "//build/zh_extral_dir/hdf_core:build_hdi_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" diff --git a/framework/tools/hc-gen/hc_gen.gni b/framework/tools/hc-gen/hc_gen.gni index b851123ec..d7f4d6e84 100644 --- a/framework/tools/hc-gen/hc_gen.gni +++ b/framework/tools/hc-gen/hc_gen.gni @@ -26,7 +26,7 @@ template("hc_gen") { "list lines") target(target_type, target_name) { - deps = [ "//drivers/hdf_core/framework/tools/hc-gen:build_hc_gen" ] + deps = [ "//build/zh_extral_dir/hdf_core:build_hc_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" -- Gitee From 3dbeef82352c53c6998ab83705fdc3849112e069 Mon Sep 17 00:00:00 2001 From: zhaohang Date: Fri, 2 Feb 2024 15:54:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=92=A4=E9=94=80=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BF=AE=E6=94=B9=20Signed-off-by:=20zhaohan?= =?UTF-8?q?g=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adapter/khdf/liteos/model/network/wifi/BUILD.gn | 1 - framework/model/network/wifi/core/module/wifi_base.c | 2 +- .../model/network/wifi/platform/src/message/nodes/local_node.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/adapter/khdf/liteos/model/network/wifi/BUILD.gn b/adapter/khdf/liteos/model/network/wifi/BUILD.gn index 18f105e4c..87316bf13 100644 --- a/adapter/khdf/liteos/model/network/wifi/BUILD.gn +++ b/adapter/khdf/liteos/model/network/wifi/BUILD.gn @@ -73,6 +73,5 @@ hdf_driver(module_name) { "$FRAMEWORKS_WIFI_ROOT/bus", "$FRAMEWORKS_WIFI_ROOT/platform/include/message", "$FRAMEWORKS_WIFI_ROOT/platform/include", - "$FRAMEWORKS_WIFI_ROOT/platform/src/message", ] } diff --git a/framework/model/network/wifi/core/module/wifi_base.c b/framework/model/network/wifi/core/module/wifi_base.c index b0f722a19..42007fec6 100644 --- a/framework/model/network/wifi/core/module/wifi_base.c +++ b/framework/model/network/wifi/core/module/wifi_base.c @@ -6,7 +6,7 @@ * See the LICENSE file in the root of this repository for complete details. */ #include "wifi_base.h" -#include "hdf_wifi_core.h" +#include "../hdf_wifi_core.h" #include "eapol.h" #include "hdf_wifi_event.h" #include "hdf_wlan_chipdriver_manager.h" diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c index 4e7bc89ca..6cdfba889 100644 --- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c +++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c @@ -10,7 +10,7 @@ #include "hdf_log.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" -#include "message_router_inner.h" +#include "../message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT -- Gitee From c3bf1e5520a729a7b8c9deda9253fe2e4a9c155f Mon Sep 17 00:00:00 2001 From: zhaohang Date: Fri, 2 Feb 2024 17:30:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9action=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=20Signed-off-by:=20zhaohang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adapter/khdf/liteos_m/hdi_mini.gni | 2 +- adapter/uhdf/hdi_small.gni | 2 +- adapter/uhdf2/hdi.gni | 2 +- framework/tools/hc-gen/hc_gen.gni | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adapter/khdf/liteos_m/hdi_mini.gni b/adapter/khdf/liteos_m/hdi_mini.gni index 2ca71e800..3f6d78b63 100644 --- a/adapter/khdf/liteos_m/hdi_mini.gni +++ b/adapter/khdf/liteos_m/hdi_mini.gni @@ -84,7 +84,7 @@ template("hdi_mini") { } action("hdi_gen") { - deps = [ "//build/zh_extral_dir/hdf_core:build_hdi_gen" ] + deps = [ "//build/templates/bpf:build_hdi_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" diff --git a/adapter/uhdf/hdi_small.gni b/adapter/uhdf/hdi_small.gni index 9cc275792..ad91867d2 100644 --- a/adapter/uhdf/hdi_small.gni +++ b/adapter/uhdf/hdi_small.gni @@ -85,7 +85,7 @@ template("hdi_small") { } action("hdi_gen") { - deps = [ "//build/zh_extral_dir/hdf_core:build_hdi_gen" ] + deps = [ "//build/templates/bpf:build_hdi_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" diff --git a/adapter/uhdf2/hdi.gni b/adapter/uhdf2/hdi.gni index d86269895..1e7ab97b4 100644 --- a/adapter/uhdf2/hdi.gni +++ b/adapter/uhdf2/hdi.gni @@ -110,7 +110,7 @@ template("hdi") { } action("hdi_gen") { - deps = [ "//build/zh_extral_dir/hdf_core:build_hdi_gen" ] + deps = [ "//build/templates/bpf:build_hdi_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" diff --git a/framework/tools/hc-gen/hc_gen.gni b/framework/tools/hc-gen/hc_gen.gni index d7f4d6e84..9e23952b6 100644 --- a/framework/tools/hc-gen/hc_gen.gni +++ b/framework/tools/hc-gen/hc_gen.gni @@ -26,7 +26,7 @@ template("hc_gen") { "list lines") target(target_type, target_name) { - deps = [ "//build/zh_extral_dir/hdf_core:build_hc_gen" ] + deps = [ "//build/templates/bpf:build_hc_gen" ] script = "/usr/bin/env" if (defined(ohos_lite)) { script = "//build/lite/run_shell_cmd.py" -- Gitee