From 4a90bc345c7a17c9c4d3e08672e43bf36d946c53 Mon Sep 17 00:00:00 2001 From: "minjie.yu" Date: Tue, 10 Oct 2023 19:58:49 +0800 Subject: [PATCH] fix: update dayu210 part_name config, fix dayu210 product build Signed-off-by: minjie.yu --- dayu210/bootanimation/BUILD.gn | 4 +-- dayu210/camera/vdi_impl/v4l2/BUILD.gn | 27 +++++++++++-------- dayu210/camera/vdi_impl/v4l2/demo/BUILD.gn | 2 +- .../vdi_impl/v4l2/device_manager/BUILD.gn | 2 +- .../driver_adapter/test/v4l2_test/BUILD.gn | 2 +- .../vdi_impl/v4l2/pipeline_core/BUILD.gn | 5 ++-- dayu210/cfg/BUILD.gn | 6 ++--- dayu210/distributedhardware/BUILD.gn | 4 +-- dayu210/ohos.build | 2 +- dayu210/startup/reboot_loader/BUILD.gn | 2 +- dayu210/updater/BUILD.gn | 16 +++++------ 11 files changed, 39 insertions(+), 33 deletions(-) diff --git a/dayu210/bootanimation/BUILD.gn b/dayu210/bootanimation/BUILD.gn index cda698c..20c8098 100755 --- a/dayu210/bootanimation/BUILD.gn +++ b/dayu210/bootanimation/BUILD.gn @@ -16,13 +16,13 @@ BOOTANIMATION_DIR = "//device/board/hihope/${product_name}/bootanimation" ohos_prebuilt_etc("bootanimation-720x1280") { source = "$BOOTANIMATION_DIR/bootanimation-720x1280.raw" - part_name = "rockchip_products" + part_name = "device_rk3588" install_enable = true } ohos_prebuilt_etc("bootanimation-1920x1080") { source = "$BOOTANIMATION_DIR/bootanimation-1920x1080.raw" - part_name = "rockchip_products" + part_name = "device_rk3588" install_enable = true } diff --git a/dayu210/camera/vdi_impl/v4l2/BUILD.gn b/dayu210/camera/vdi_impl/v4l2/BUILD.gn index 50c0ce4..1349708 100755 --- a/dayu210/camera/vdi_impl/v4l2/BUILD.gn +++ b/dayu210/camera/vdi_impl/v4l2/BUILD.gn @@ -34,7 +34,7 @@ if (product_name == "rk3568_mini_system") { relative_install_dir = "hdfconfig" install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } hc_gen_c("generate_source") { @@ -95,7 +95,7 @@ if (product_name == "rk3568_mini_system") { relative_install_dir = "hdfconfig" install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } config("example_config") { @@ -196,10 +196,7 @@ if (product_name == "rk3568_mini_system") { deps = [ "$board_camera_path/device_manager:camera_device_manager", - "$board_camera_path/metadata_manager:camera_metadata_manager", "$board_camera_path/pipeline_core:camera_pipeline_core", - "$camera_path/buffer_manager:camera_buffer_manager", - "$camera_path/utils:camera_utils", ] defines = [] @@ -213,6 +210,12 @@ if (product_name == "rk3568_mini_system") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "drivers_peripheral_camera:peripheral_camera_buffer_manager", + "drivers_peripheral_camera:peripheral_camera_device_manager", + "drivers_peripheral_camera:peripheral_camera_metadata_manager", + "drivers_peripheral_camera:peripheral_camera_pipeline_core", + "drivers_peripheral_camera:peripheral_camera_utils", + "drivers_peripheral_camera:peripheral_camera_v4l2_adapter", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -237,7 +240,7 @@ if (product_name == "rk3568_mini_system") { public_configs = [ ":camhdi_impl_config" ] install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_static_library("camera_host_vdi_impl_1.0_static") { @@ -246,10 +249,7 @@ if (product_name == "rk3568_mini_system") { deps = [ "$board_camera_path/device_manager:camera_device_manager", - "$board_camera_path/metadata_manager:camera_metadata_manager", "$board_camera_path/pipeline_core:camera_pipeline_core", - "$camera_path/buffer_manager:camera_buffer_manager", - "$camera_path/utils:camera_utils", ] defines = [] @@ -263,6 +263,11 @@ if (product_name == "rk3568_mini_system") { if (is_standard_system) { external_deps = [ "c_utils:utils", + "drivers_peripheral_camera:peripheral_camera_buffer_manager", + "drivers_peripheral_camera:peripheral_camera_device_manager", + "drivers_peripheral_camera:peripheral_camera_metadata_manager", + "drivers_peripheral_camera:peripheral_camera_pipeline_core", + "drivers_peripheral_camera:peripheral_camera_utils", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -288,7 +293,7 @@ if (product_name == "rk3568_mini_system") { public_configs = [ ":camhdi_impl_config" ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_shared_library("camera_pipeline_config") { @@ -300,7 +305,7 @@ if (product_name == "rk3568_mini_system") { [ "$camera_path/pipeline_core/pipeline_impl/src/strategy/config" ] install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } group("camera_board_vdi_impl") { diff --git a/dayu210/camera/vdi_impl/v4l2/demo/BUILD.gn b/dayu210/camera/vdi_impl/v4l2/demo/BUILD.gn index 129b7d1..c9663ab 100644 --- a/dayu210/camera/vdi_impl/v4l2/demo/BUILD.gn +++ b/dayu210/camera/vdi_impl/v4l2/demo/BUILD.gn @@ -97,5 +97,5 @@ ohos_executable("ohos_camera_demo") { install_enable = false install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } diff --git a/dayu210/camera/vdi_impl/v4l2/device_manager/BUILD.gn b/dayu210/camera/vdi_impl/v4l2/device_manager/BUILD.gn index 939a806..219b7d8 100755 --- a/dayu210/camera/vdi_impl/v4l2/device_manager/BUILD.gn +++ b/dayu210/camera/vdi_impl/v4l2/device_manager/BUILD.gn @@ -76,5 +76,5 @@ ohos_shared_library("camera_device_manager") { public_configs = [ ":device_manager_config" ] install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } diff --git a/dayu210/camera/vdi_impl/v4l2/driver_adapter/test/v4l2_test/BUILD.gn b/dayu210/camera/vdi_impl/v4l2/driver_adapter/test/v4l2_test/BUILD.gn index 1a5ebd5..814dbb0 100644 --- a/dayu210/camera/vdi_impl/v4l2/driver_adapter/test/v4l2_test/BUILD.gn +++ b/dayu210/camera/vdi_impl/v4l2/driver_adapter/test/v4l2_test/BUILD.gn @@ -55,5 +55,5 @@ ohos_executable("v4l2_main") { public_configs = [ ":v4l2_maintest" ] install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } diff --git a/dayu210/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn b/dayu210/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn index 7ceb33b..bff39c1 100755 --- a/dayu210/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn +++ b/dayu210/camera/vdi_impl/v4l2/pipeline_core/BUILD.gn @@ -93,6 +93,7 @@ ohos_shared_library("camera_pipeline_core") { external_deps = [ "hilog:libhilog" ] } external_deps += [ + "c_utils:utils", "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", "graphic_chipsetsdk:surface", @@ -102,7 +103,7 @@ ohos_shared_library("camera_pipeline_core") { public_configs = [ ":pipe_config" ] install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } config("example_config") { @@ -126,5 +127,5 @@ ohos_shared_library("camera_ipp_algo_example") { public_configs = [ ":example_config" ] install_images = [ chipset_base_dir ] subsystem_name = "rockchip_products" - part_name = "rockchip_products" + part_name = "device_rk3588" } diff --git a/dayu210/cfg/BUILD.gn b/dayu210/cfg/BUILD.gn index 1644bff..82349f6 100755 --- a/dayu210/cfg/BUILD.gn +++ b/dayu210/cfg/BUILD.gn @@ -15,21 +15,21 @@ import("//build/ohos.gni") ohos_prebuilt_etc("init.dayu210.cfg") { source = "init.dayu210.cfg" - part_name = "rockchip_products" + part_name = "device_rk3588" install_images = [ chipset_base_dir ] install_enable = true } ohos_prebuilt_etc("init.dayu210.usb.cfg") { source = "init.dayu210.usb.cfg" - part_name = "rockchip_products" + part_name = "device_rk3588" install_images = [ chipset_base_dir ] install_enable = true } ohos_prebuilt_etc("fstab.dayu210") { source = "fstab.dayu210" - part_name = "rockchip_products" + part_name = "device_rk3588" install_images = [ vendor_base_dir ] install_enable = true } diff --git a/dayu210/distributedhardware/BUILD.gn b/dayu210/distributedhardware/BUILD.gn index f945af1..f9be9ff 100755 --- a/dayu210/distributedhardware/BUILD.gn +++ b/dayu210/distributedhardware/BUILD.gn @@ -17,7 +17,7 @@ ohos_prebuilt_etc("distributed_hardware_components_cfg.json") { install_enable = true module_install_dir = "etc/distributedhardware/" install_images = [ chipset_base_dir ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("dinput_business_event_whitelist.cfg") { @@ -25,7 +25,7 @@ ohos_prebuilt_etc("dinput_business_event_whitelist.cfg") { install_enable = true module_install_dir = "etc/distributedhardware/" install_images = [ chipset_base_dir ] - part_name = "rockchip_products" + part_name = "device_rk3588" } group("distributedhardware") { diff --git a/dayu210/ohos.build b/dayu210/ohos.build index b2381b0..0a5ae34 100755 --- a/dayu210/ohos.build +++ b/dayu210/ohos.build @@ -1,7 +1,7 @@ { "subsystem": "rockchip_products", "parts": { - "rockchip_products": { + "device_rk3588": { "module_list": [ "//device/board/hihope/${product_name}:dayu210_group", "//vendor/hihope/${product_name}/bluetooth:libbt_vendor", diff --git a/dayu210/startup/reboot_loader/BUILD.gn b/dayu210/startup/reboot_loader/BUILD.gn index bedbcc9..e282d51 100755 --- a/dayu210/startup/reboot_loader/BUILD.gn +++ b/dayu210/startup/reboot_loader/BUILD.gn @@ -21,7 +21,7 @@ ohos_shared_library("rebootloader") { } else { module_install_dir = "lib/init/autorun" } - part_name = "rockchip_products" + part_name = "device_rk3588" install_enable = true install_images = [ chipset_base_dir ] } diff --git a/dayu210/updater/BUILD.gn b/dayu210/updater/BUILD.gn index d65463b..a71fb2d 100755 --- a/dayu210/updater/BUILD.gn +++ b/dayu210/updater/BUILD.gn @@ -23,37 +23,37 @@ updater_hilog_cfg = "//base/hiviewdfx/hilog/services/hilogd/etc/hilogd.cfg" ohos_prebuilt_etc("updater_hilog.cfg") { source = "${updater_hilog_cfg}" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("updater_faultloggerd.cfg") { source = "${updater_faultloggerd_cfg}" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("updater_init.cfg") { source = "config/init.cfg" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("updater_init_usb.cfg") { source = "${updater_usb_init_cfg_path}" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("updater_init_usb_configfs.cfg") { source = "${updater_init_usb_configfs_path_cfg}" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("updater_init_dayu210_usb.cfg") { source = "config/init.dayu210.usb.cfg" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("signing_cert.crt") { @@ -63,13 +63,13 @@ ohos_prebuilt_etc("signing_cert.crt") { "system", "updater", ] - part_name = "rockchip_products" + part_name = "device_rk3588" } ohos_prebuilt_etc("fstab.updater") { source = "config/fstab.updater" install_images = [ "updater" ] - part_name = "rockchip_products" + part_name = "device_rk3588" } group("updater_files") { -- Gitee