From d8f715913fb2f56791d4fce305a71d3cd8e9247b Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Wed, 9 Mar 2022 11:47:30 +0800 Subject: [PATCH 1/2] device_hihope split to device_board_hihope and device_soc_rockchip Signed-off-by: yang_hongliang --- camera/hal/camera.gni | 2 +- display/hal/BUILD.gn | 2 +- usb/gadget/function/acm/BUILD.gn | 5 +++-- usb/gadget/function/ecm/BUILD.gn | 5 +++-- usb/gadget/function/master/BUILD.gn | 5 +++-- usb/hal/service/BUILD.gn | 5 +++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/camera/hal/camera.gni b/camera/hal/camera.gni index df003b6807..9b04e4f5e8 100755 --- a/camera/hal/camera.gni +++ b/camera/hal/camera.gni @@ -27,7 +27,7 @@ if (defined(ohos_lite)) { import( "//device/soc/hisilicon/common/hal/media/camera/hi3516dv300/linux_standard/camera/product.gni") } else { - import("//device/${product_company}/${device_name}/camera/product.gni") + import("//device/board/${product_company}/${device_name}/camera/product.gni") } } diff --git a/display/hal/BUILD.gn b/display/hal/BUILD.gn index 876d6bdbe2..cbb17b2026 100644 --- a/display/hal/BUILD.gn +++ b/display/hal/BUILD.gn @@ -35,7 +35,7 @@ if (defined(ohos_lite)) { if (device_company == "hisilicon") { device_hal = "soc/${device_company}/common/hal" } else if (product_name != "ohos-arm64") { - device_hal = "${device_company}/hardware" + device_hal = "soc/${device_company}/hardware" } config("display_hdi_public_config") { diff --git a/usb/gadget/function/acm/BUILD.gn b/usb/gadget/function/acm/BUILD.gn index 6f259592a4..59579e1ed3 100755 --- a/usb/gadget/function/acm/BUILD.gn +++ b/usb/gadget/function/acm/BUILD.gn @@ -22,9 +22,10 @@ ohos_shared_library("libusbfn_cdcacm") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" if (device_company == "hihope") { - default_config_path = "//device/$device_company/$device_name/usb/include" + default_config_path = + "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { - default_config_path = "//device/hihope/rk3568/usb/include" + default_config_path = "//device/board/hihope/rk3568/usb/include" } include_dirs = [ diff --git a/usb/gadget/function/ecm/BUILD.gn b/usb/gadget/function/ecm/BUILD.gn index 9ab3d42aeb..26aa19219d 100755 --- a/usb/gadget/function/ecm/BUILD.gn +++ b/usb/gadget/function/ecm/BUILD.gn @@ -22,9 +22,10 @@ ohos_shared_library("libusbfn_cdcecm") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" if (device_company == "hihope") { - default_config_path = "//device/$device_company/$device_name/usb/include" + default_config_path = + "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { - default_config_path = "//device/hihope/rk3568/usb/include" + default_config_path = "//device/board/hihope/rk3568/usb/include" } include_dirs = [ diff --git a/usb/gadget/function/master/BUILD.gn b/usb/gadget/function/master/BUILD.gn index 64347a82f9..492a7b1c02 100755 --- a/usb/gadget/function/master/BUILD.gn +++ b/usb/gadget/function/master/BUILD.gn @@ -22,9 +22,10 @@ ohos_shared_library("libusbfn_master") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" if (device_company == "hihope") { - default_config_path = "//device/$device_company/$device_name/usb/include" + default_config_path = + "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { - default_config_path = "//device/hihope/rk3568/usb/include" + default_config_path = "//device/board/hihope/rk3568/usb/include" } include_dirs = [ diff --git a/usb/hal/service/BUILD.gn b/usb/hal/service/BUILD.gn index ee087180c6..d273f3dd2c 100644 --- a/usb/hal/service/BUILD.gn +++ b/usb/hal/service/BUILD.gn @@ -22,9 +22,10 @@ config("usbd_public_config") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" if (device_company == "hihope") { - default_config_path = "//device/$device_company/$device_name/usb/include" + default_config_path = + "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { - default_config_path = "//device/hihope/rk3568/usb/include" + default_config_path = "//device/board/hihope/rk3568/usb/include" } include_dirs = [ -- Gitee From a7a706c6e97e9026bd7a690fc23714ec52921f26 Mon Sep 17 00:00:00 2001 From: yang_hongliang Date: Wed, 9 Mar 2022 12:51:09 +0800 Subject: [PATCH 2/2] fix format check Signed-off-by: yang_hongliang --- camera/hal/camera.gni | 3 ++- usb/gadget/function/acm/BUILD.gn | 2 +- usb/gadget/function/ecm/BUILD.gn | 2 +- usb/gadget/function/master/BUILD.gn | 2 +- usb/hal/service/BUILD.gn | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/camera/hal/camera.gni b/camera/hal/camera.gni index 9b04e4f5e8..c2436fda0c 100755 --- a/camera/hal/camera.gni +++ b/camera/hal/camera.gni @@ -27,7 +27,8 @@ if (defined(ohos_lite)) { import( "//device/soc/hisilicon/common/hal/media/camera/hi3516dv300/linux_standard/camera/product.gni") } else { - import("//device/board/${product_company}/${device_name}/camera/product.gni") + import( + "//device/board/${product_company}/${device_name}/camera/product.gni") } } diff --git a/usb/gadget/function/acm/BUILD.gn b/usb/gadget/function/acm/BUILD.gn index 59579e1ed3..6c19cadb24 100755 --- a/usb/gadget/function/acm/BUILD.gn +++ b/usb/gadget/function/acm/BUILD.gn @@ -21,7 +21,7 @@ group("usbfn_cdcacm") { ohos_shared_library("libusbfn_cdcacm") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" - if (device_company == "hihope") { + if (product_company == "hihope") { default_config_path = "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { diff --git a/usb/gadget/function/ecm/BUILD.gn b/usb/gadget/function/ecm/BUILD.gn index 26aa19219d..9f78b7b830 100755 --- a/usb/gadget/function/ecm/BUILD.gn +++ b/usb/gadget/function/ecm/BUILD.gn @@ -21,7 +21,7 @@ group("usbfn_cdcecm") { ohos_shared_library("libusbfn_cdcecm") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" - if (device_company == "hihope") { + if (product_company == "hihope") { default_config_path = "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { diff --git a/usb/gadget/function/master/BUILD.gn b/usb/gadget/function/master/BUILD.gn index 492a7b1c02..537b687220 100755 --- a/usb/gadget/function/master/BUILD.gn +++ b/usb/gadget/function/master/BUILD.gn @@ -21,7 +21,7 @@ group("usbfn_master") { ohos_shared_library("libusbfn_master") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" - if (device_company == "hihope") { + if (product_company == "hihope") { default_config_path = "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { diff --git a/usb/hal/service/BUILD.gn b/usb/hal/service/BUILD.gn index d273f3dd2c..5d8fe9a371 100644 --- a/usb/hal/service/BUILD.gn +++ b/usb/hal/service/BUILD.gn @@ -21,7 +21,7 @@ config("usbd_private_config") { config("usbd_public_config") { default_config_path = "//device/soc/$device_company/common/hal/usb/$device_name/include" - if (device_company == "hihope") { + if (product_company == "hihope") { default_config_path = "//device/board/$product_company/$device_name/usb/include" } else if (device_company == "openharmony") { -- Gitee