diff --git a/yangfan/bootanimation/BUILD.gn b/yangfan/bootanimation/BUILD.gn index 212dd8a734a90ba303dab07080345b3c0a6804c0..b9362933de3438e1356cc70246da30f22930489c 100644 --- a/yangfan/bootanimation/BUILD.gn +++ b/yangfan/bootanimation/BUILD.gn @@ -9,13 +9,13 @@ BOOTANIMATION_DIR = "//device/board/isoftstone/yangfan/bootanimation" ohos_prebuilt_etc("bootanimation-1920x1080") { source = "$BOOTANIMATION_DIR/bootanimation-1920x1080.raw" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } ohos_prebuilt_etc("bootanimation-720x1280") { source = "$BOOTANIMATION_DIR/bootanimation-720x1280.raw" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } diff --git a/yangfan/cfg/rootfs/BUILD.gn b/yangfan/cfg/rootfs/BUILD.gn index 634d6a2ebe388c2b93d9146052b3512d2c0c9036..8d485bac4380b6e6178ef72721560382ee8d1097 100644 --- a/yangfan/cfg/rootfs/BUILD.gn +++ b/yangfan/cfg/rootfs/BUILD.gn @@ -8,7 +8,7 @@ import("//build/ohos.gni") ohos_prebuilt_etc("init.rk3399.cfg") { source = "init.rk3399.cfg" - part_name = "rockchip_products" + part_name = "device_yangfan" install_images = [ chipset_base_dir ] install_enable = true } @@ -18,19 +18,19 @@ ohos_prebuilt_executable("weston.cfg") { source = "weston.cfg" module_install_dir = "etc/init" install_images = [ chipset_base_dir ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_etc("init.rk3399.usb.cfg") { source = "init.rk3399.usb.cfg" - part_name = "rockchip_products" + part_name = "device_yangfan" install_images = [ chipset_base_dir ] install_enable = true } ohos_prebuilt_etc("fstab.rk3399") { source = "fstab.rk3399" - part_name = "rockchip_products" + part_name = "device_yangfan" install_images = [ chipset_base_dir ] install_enable = true } @@ -47,7 +47,7 @@ if (enable_ramdisk) { } else { ohos_prebuilt_etc("fstab.required") { source = "fstab.required" - part_name = "rockchip_products" + part_name = "device_yangfan" install_images = [ "system" ] install_enable = true } diff --git a/yangfan/cfg/rootfs/weston.cfg b/yangfan/cfg/rootfs/weston.cfg index ea2e69726c205a73c2b203e71661c5770018cc09..f9152d65a25b872460dab199387cf0428d7d06f1 100644 --- a/yangfan/cfg/rootfs/weston.cfg +++ b/yangfan/cfg/rootfs/weston.cfg @@ -2,7 +2,7 @@ "jobs" : [{ "name" : "services:weston", "cmds" : [ - "mkdir /data/weston", + "mkdir /data/weston" ] } ], diff --git a/yangfan/common/mqtt/mqtt.gni b/yangfan/common/mqtt/mqtt.gni index bd71497ba5fe0a159914e8f4a1d12bb133c88e87..f8089eb8dd7926f4a383904b42bb718d48c754c2 100644 --- a/yangfan/common/mqtt/mqtt.gni +++ b/yangfan/common/mqtt/mqtt.gni @@ -1,3 +1,3 @@ -subsystem_name = "rockchip_products" +subsystem_name = "device_yangfan" part_name = "mqtt" mqtt_exe_prefix = "mqtt_" diff --git a/yangfan/common/mqtt/ohos.build b/yangfan/common/mqtt/ohos.build index f63a5775e641644fa71d07d1f115bf5af8b96017..a6da572a7e3da219d5858194ef27720315e3357c 100644 --- a/yangfan/common/mqtt/ohos.build +++ b/yangfan/common/mqtt/ohos.build @@ -1,5 +1,5 @@ { - "subsystem": "rockchip_products", + "subsystem": "device_yangfan", "parts": { "mqtt": { "module_list": [ diff --git a/yangfan/kernel/drivers/wifi/BUILD.gn b/yangfan/kernel/drivers/wifi/BUILD.gn index afd056830ed86d73149ce9af2638993eb4eb9ff1..6f45970767c27a6a0ce3be8a1b5fb968d99003b5 100755 --- a/yangfan/kernel/drivers/wifi/BUILD.gn +++ b/yangfan/kernel/drivers/wifi/BUILD.gn @@ -22,7 +22,7 @@ ohos_prebuilt_etc("clm_bcm43752a2_ag.blob") { source = "$AP6XXX_ETC_DIR/clm_bcm43752a2_ag.blob" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -30,7 +30,7 @@ ohos_prebuilt_etc("fw_bcm43752a2_ag_apsta.bin") { source = "$AP6XXX_ETC_DIR/fw_bcm43752a2_ag_apsta.bin" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -38,7 +38,7 @@ ohos_prebuilt_etc("fw_bcm43752a2_ag.bin") { source = "$AP6XXX_ETC_DIR/fw_bcm43752a2_ag.bin" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -46,7 +46,7 @@ ohos_prebuilt_etc("nvram_ap6275s.txt") { source = "$AP6XXX_ETC_DIR/nvram_ap6275s.txt" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -55,7 +55,7 @@ ohos_prebuilt_etc("fw_bcm43438a1.bin") { source = "$AP6XXX_ETC_DIR/fw_bcm43438a1.bin" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -63,7 +63,7 @@ ohos_prebuilt_etc("fw_cyw43438_apsta.bin") { source = "$AP6XXX_ETC_DIR/fw_cyw43438_apsta.bin" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -71,7 +71,7 @@ ohos_prebuilt_etc("fw_cyw43438_p2p.bin") { source = "$AP6XXX_ETC_DIR/fw_cyw43438_p2p.bin" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -79,7 +79,7 @@ ohos_prebuilt_etc("nvram_ap6212a.txt") { source = "$AP6XXX_ETC_DIR/nvram_ap6212a.txt" install_images = [ chipset_base_dir ] relative_install_dir = "firmware" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -87,7 +87,7 @@ ohos_prebuilt_etc("cywdhd.ko") { source = "$MODULES_DIR/cywdhd.ko" install_images = [ chipset_base_dir ] relative_install_dir = "modules" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -95,7 +95,7 @@ ohos_prebuilt_etc("bcmdhd.ko") { source = "$MODULES_DIR/bcmdhd.ko" install_images = [ chipset_base_dir ] relative_install_dir = "modules" - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -104,14 +104,14 @@ ohos_prebuilt_etc("bcmdhd.ko") { ohos_prebuilt_etc("resolv.conf") { source = "$DNS_CONFIG_DIR/etc/resolv.conf" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } ohos_prebuilt_etc("hostapd.conf") { source = "$DNS_CONFIG_DIR/etc/hostapd.conf" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" install_enable = true } @@ -120,7 +120,7 @@ ohos_prebuilt_executable("wpa_cli") { source = "$WIFI_BIN_DIR/wpa_cli" module_install_dir = "bin" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_executable("wpa_supplicant") { @@ -128,7 +128,7 @@ ohos_prebuilt_executable("wpa_supplicant") { source = "$WIFI_BIN_DIR/wpa_supplicant" module_install_dir = "bin" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_executable("hostapd") { @@ -136,7 +136,7 @@ ohos_prebuilt_executable("hostapd") { source = "$WIFI_BIN_DIR/hostapd" module_install_dir = "bin" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_executable("hostapd_cli") { @@ -144,28 +144,28 @@ ohos_prebuilt_executable("hostapd_cli") { source = "$WIFI_BIN_DIR/hostapd_cli" module_install_dir = "bin" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_shared_library("libwpa.z.so") { source = "$WIFI_LIB_DIR/libwpa.z.so" module_install_dir = "lib" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_shared_library("libwpa_client.z.so") { source = "$WIFI_LIB_DIR/libwpa_client.z.so" module_install_dir = "lib" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } ohos_prebuilt_shared_library("libnl_share.z.so") { source = "$WIFI_LIB_DIR/libnl_share.z.so" module_install_dir = "lib" install_images = [ "system" ] - part_name = "rockchip_products" + part_name = "device_yangfan" } group("ap6xxx") { diff --git a/yangfan/kernel/hdf/drivers/camera/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/BUILD.gn index 8918153aa58b466f5e8f772fbb2208dc0ffa1cbb..dfb28f1d99daffe1483abce3c316b3b5af83a635 100644 --- a/yangfan/kernel/hdf/drivers/camera/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/BUILD.gn @@ -27,8 +27,8 @@ ohos_prebuilt_etc("camera_host_config.hcb") { hcs_outputs = get_target_outputs(":build_camera_host_config") source = hcs_outputs[0] relative_install_dir = "hdfconfig" - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } hc_gen_c("generate_source") { @@ -87,8 +87,8 @@ ohos_prebuilt_etc("ipp_algo_config.hcb") { hcs_outputs = get_target_outputs(":build_ipp_algo_config") source = hcs_outputs[0] relative_install_dir = "hdfconfig" - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } config("example_config") { @@ -228,8 +228,8 @@ ohos_shared_library("camera_host_vdi_impl_1.0") { ] public_configs = [ ":camhdi_impl_config" ] install_images = [ chipset_base_dir ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } ohos_static_library("camera_host_vdi_impl_1.0_static") { @@ -278,8 +278,8 @@ ohos_static_library("camera_host_vdi_impl_1.0_static") { ] public_configs = [ ":camhdi_impl_config" ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } group("camera_board_test") { diff --git a/yangfan/kernel/hdf/drivers/camera/demo/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/demo/BUILD.gn index be3d54bdb997e0147e2e755a63444dfb11504e76..20065758045959c7e621ec52e1e2878dda6e44d7 100644 --- a/yangfan/kernel/hdf/drivers/camera/demo/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/demo/BUILD.gn @@ -99,6 +99,6 @@ ohos_executable("ohos_camera_demo") { public_configs = [ ":ohos_camera_demo_config" ] install_enable = false install_images = [ chipset_base_dir ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } diff --git a/yangfan/kernel/hdf/drivers/camera/device_manager/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/device_manager/BUILD.gn index a691a551cd198eafaf9c2fc6acdb05e0a62fe4de..9f3c60d8d309c2515d10a5ab54e7ca802ccd58c6 100644 --- a/yangfan/kernel/hdf/drivers/camera/device_manager/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/device_manager/BUILD.gn @@ -85,6 +85,6 @@ ohos_shared_library("camera_device_manager") { } external_deps += [ "drivers_interface_camera:metadata" ] public_configs = [ ":device_manager_config" ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } diff --git a/yangfan/kernel/hdf/drivers/camera/driver_adapter/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/driver_adapter/BUILD.gn index 062c62fd8d00af2f75c85effc8aeb9937cbff853..095e5ae384951c5b7d7e6778460c092f614329ee 100644 --- a/yangfan/kernel/hdf/drivers/camera/driver_adapter/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/driver_adapter/BUILD.gn @@ -30,8 +30,8 @@ if (defined(ohos_lite)) { source = "//device/hisilicon/hardware/media/hal/camera/libs/hispark_taurus/std/libdriver_adapter.z.so" } module_install_dir = "lib/" - part_name = "rockchip_products" - subsystem_name = "rockchip_products" + part_name = "device_yangfan" + subsystem_name = "device_yangfan" } } @@ -81,6 +81,6 @@ ohos_shared_library("camera_v4l2_adapter") { external_deps += [ "drivers_interface_camera:metadata" ] public_configs = [ ":v4l2_config" ] install_images = [ chipset_base_dir ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } diff --git a/yangfan/kernel/hdf/drivers/camera/driver_adapter/test/v4l2_test/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/driver_adapter/test/v4l2_test/BUILD.gn index f6d0da3e539d7b6354ababd6eed6087aa9ed0efe..3c2506220a7f1a7a99c314f88f3cf0bd51ee011e 100644 --- a/yangfan/kernel/hdf/drivers/camera/driver_adapter/test/v4l2_test/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/driver_adapter/test/v4l2_test/BUILD.gn @@ -54,6 +54,6 @@ ohos_executable("v4l2_main") { public_configs = [ ":v4l2_maintest" ] install_images = [ chipset_base_dir ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } diff --git a/yangfan/kernel/hdf/drivers/camera/metadata_manager/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/metadata_manager/BUILD.gn index 4b996a46e29fad78dc6dd42bc0cb77f6e555fccc..81a8fde58f72da0e28a09da12e5e15258c2a4fd0 100644 --- a/yangfan/kernel/hdf/drivers/camera/metadata_manager/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/metadata_manager/BUILD.gn @@ -71,7 +71,7 @@ if (!defined(ohos_lite)) { public_configs = [ ":camera_metadata_manager_config" ] install_images = [ chipset_base_dir ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } } diff --git a/yangfan/kernel/hdf/drivers/camera/pipeline_core/BUILD.gn b/yangfan/kernel/hdf/drivers/camera/pipeline_core/BUILD.gn index 758853177a9000d994831301f00e1de774647458..7546e64eb65e3f855433b9abb738fede01089b2e 100644 --- a/yangfan/kernel/hdf/drivers/camera/pipeline_core/BUILD.gn +++ b/yangfan/kernel/hdf/drivers/camera/pipeline_core/BUILD.gn @@ -122,6 +122,7 @@ ohos_shared_library("camera_pipeline_core") { "//device/soc/rockchip/rk3399/hardware/rga/include", "//device/soc/rockchip/rk3399/hardware/mpp/include", "//third_party/libjpeg-turbo", + "//third_party/bounds_checking_function/include", "$camera_path/metadata_manager/include", # hcs parser @@ -137,6 +138,7 @@ ohos_shared_library("camera_pipeline_core") { "//device/soc/rockchip/rk3399/hardware/rga:librga", "//drivers/interface/camera/v1_0:libcamera_stub_1.0", "//third_party/libjpeg-turbo:turbojpeg_static", + "//third_party/bounds_checking_function:libsec_shared", # hcs parser "$hdf_uhdf_path/utils:libhdf_utils", @@ -153,8 +155,8 @@ ohos_shared_library("camera_pipeline_core") { } external_deps += [ "drivers_interface_camera:metadata" ] public_configs = [ ":pipe_config" ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } config("example_config") { @@ -176,6 +178,6 @@ ohos_shared_library("camera_ipp_algo_example") { ] external_deps = [ "c_utils:utils" ] public_configs = [ ":example_config" ] - subsystem_name = "rockchip_products" - part_name = "rockchip_products" + subsystem_name = "device_yangfan" + part_name = "device_yangfan" } diff --git a/yangfan/ohos.build b/yangfan/ohos.build index 62ad4fc38fce9166137f8a6d1de35a55aa746452..b20289aa84556a8b297699304cf33c815809d71e 100755 --- a/yangfan/ohos.build +++ b/yangfan/ohos.build @@ -1,7 +1,7 @@ { - "subsystem": "rockchip_products", + "subsystem": "device_yangfan", "parts": { - "rockchip_products": { + "device_yangfan": { "module_list": [ "//device/board/isoftstone/${product_name}:rk3399_group", "//vendor/isoftstone/${product_name}/bluetooth:libbt_vendor",