From: luozheng <1732036298@qq.com> Date: Mon, 20 Apr 2026 03:37:23 +0000 (+0800) Subject: build文件夹1201patch合并提交 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3355%2Fhead;p=mirrors%2FFD230.git build文件夹1201patch合并提交 --- diff --git a/code/sdk/build/cmake/open_source.cmake b/code/sdk/build/cmake/open_source.cmake index f4eec418e..9eb4f9aa6 100644 --- a/code/sdk/build/cmake/open_source.cmake +++ b/code/sdk/build/cmake/open_source.cmake @@ -1,3 +1,4 @@ include(${CMAKE_DIR}/open_source/gmssl.cmake) include(${CMAKE_DIR}/open_source/mbedtls.cmake) -include(${CMAKE_DIR}/open_source/libogg.cmake) \ No newline at end of file +include(${CMAKE_DIR}/open_source/libogg.cmake) +include(${CMAKE_DIR}/open_source/mqtt.cmake) \ No newline at end of file diff --git a/code/sdk/build/cmake/open_source/mqtt.cmake b/code/sdk/build/cmake/open_source/mqtt.cmake new file mode 100644 index 000000000..3633f7879 --- /dev/null +++ b/code/sdk/build/cmake/open_source/mqtt.cmake @@ -0,0 +1,73 @@ +set(COMPONENT_NAME "mqtt") + +set(CMAKE_MQTT_SOURCE_DIR + ${ROOT_DIR}/open_source/mqtt/src) + +set(SOURCES + ${CMAKE_MQTT_SOURCE_DIR}/MQTTTime.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTProtocolClient.c + ${CMAKE_MQTT_SOURCE_DIR}/Clients.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTClient.c + #${CMAKE_MQTT_SOURCE_DIR}/MQTTAsync.c + #${CMAKE_MQTT_SOURCE_DIR}/MQTTAsyncUtils.c + ${CMAKE_MQTT_SOURCE_DIR}/utf-8.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTPacket.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTPacketOut.c + ${CMAKE_MQTT_SOURCE_DIR}/Messages.c + ${CMAKE_MQTT_SOURCE_DIR}/Tree.c + ${CMAKE_MQTT_SOURCE_DIR}/Socket.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTPersistence.c + ${CMAKE_MQTT_SOURCE_DIR}/Thread.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTProtocolOut.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTPersistenceDefault.c + ${CMAKE_MQTT_SOURCE_DIR}/SocketBuffer.c + ${CMAKE_MQTT_SOURCE_DIR}/LinkedList.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTProperties.c + ${CMAKE_MQTT_SOURCE_DIR}/MQTTReasonCodes.c + ${CMAKE_MQTT_SOURCE_DIR}/Base64.c + ${CMAKE_MQTT_SOURCE_DIR}/SHA1.c + ${CMAKE_MQTT_SOURCE_DIR}/WebSocket.c + ${CMAKE_MQTT_SOURCE_DIR}/Heap.c + ${CMAKE_MQTT_SOURCE_DIR}/Log.c + ${CMAKE_MQTT_SOURCE_DIR}/SSLSocket_mbedtls.c + ${CMAKE_MQTT_SOURCE_DIR}/Proxy.c +) + +set(PUBLIC_HEADER +) + +set(PRIVATE_HEADER + ${CMAKE_MQTT_SOURCE_DIR}/include + ${ROOT_DIR}/open_source/mbedtls/mbedtls_v3.6.0/include + ${ROOT_DIR}/open_source/mbedtls/mbedtls_v3.6.0/library + ${ROOT_DIR}/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include + ${ROOT_DIR}/open_source/openharmony/third_party/lwip/lwip_adapter/liteos/src/include +) + +set(PRIVATE_DEFINES + HIGH_PERFORMANCE + NOSTACKTRACE + MBEDTLS +) + +set(PUBLIC_DEFINES + WEAR_LITEOS_ADAPT + MBEDTLS_USE_CRT +) + +# use this when you want to add ccflags like -include xxx +set(COMPONENT_PUBLIC_CCFLAGS +) + +set(COMPONENT_CCFLAGS +) + +set(WHOLE_LINK + true +) + +set(MAIN_COMPONENT + false +) + +build_component() \ No newline at end of file diff --git a/code/sdk/build/config/target_config/brandy/Brandy.json b/code/sdk/build/config/target_config/brandy/Brandy.json index 601cba443..3177ddf4f 100644 --- a/code/sdk/build/config/target_config/brandy/Brandy.json +++ b/code/sdk/build/config/target_config/brandy/Brandy.json @@ -107,6 +107,46 @@ } } }, + "brandy-ssb-native-js": { + "cmake": { + "build": { + "build_argv": "brandy-ssb-native-js" + }, + "stack analysis": { + "analysis_compiler_path": "./tools/bin/compiler/linx/linx_170/linx-llvm-binary-debug/linx-llvm-binary-release-win-musl/bin/riscv32" + }, + "image analysis": { + "analysis_elf_path": "./output/brandy/acore/brandy-ssb-native-js/ssb.elf", + "analysis_map_path": "./output/brandy/acore/brandy-ssb-native-js/ssb.map" + }, + "upload": { + "upload_partitions": "./tools/pkg/fwpkg/brandy/upload_app.fwpkg" + }, + "chip config": { + "board_build.mcu": "brandy" + } + } + }, + "brandy-ssb-xts": { + "cmake": { + "build": { + "build_argv": "brandy-ssb-xts" + }, + "stack analysis": { + "analysis_compiler_path": "./tools/bin/compiler/linx/linx_170/linx-llvm-binary-debug/linx-llvm-binary-release-win-musl/bin/riscv32" + }, + "image analysis": { + "analysis_elf_path": "./output/brandy/acore/brandy-ssb-xts/ssb.elf", + "analysis_map_path": "./output/brandy/acore/brandy-ssb-xts/ssb.map" + }, + "upload": { + "upload_partitions": "./tools/pkg/fwpkg/brandy/upload_app.fwpkg" + }, + "chip config": { + "board_build.mcu": "brandy" + } + } + }, "brandy-target1": { "cmake": { "build": { @@ -366,6 +406,32 @@ "board_build.mcu": "brandy" } } + }, + "pack_brandy_native_js": { + "cmake": { + "build": { + "build_argv": "pack_brandy_native_js" + }, + "upload": { + "upload_partitions": "./tools/pkg/fwpkg/brandy/upload_app.fwpkg" + }, + "chip config": { + "board_build.mcu": "brandy" + } + } + }, + "pack_brandy_xts": { + "cmake": { + "build": { + "build_argv": "pack_brandy_xts" + }, + "upload": { + "upload_partitions": "./tools/pkg/fwpkg/brandy/upload_app.fwpkg" + }, + "chip config": { + "board_build.mcu": "brandy" + } + } } } } diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index dd32f75b1..308c86c9b 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -118,14 +118,14 @@ target = { 'SW_UART_DEBUG', 'SAVE_EXC_INFO', 'JS_ENABLE', 'CONFIG_LOW_POWER_TEST', 'SUPPORT_OHOSFWK', "HASH_MEM_COPY", 'ENABLE_ECC', 'MIPI_ULPS_SUPPORT', 'SUPPORT_ALIPAY_SEC', 'SUPPORT_RC_CALIBRATION', 'SUPPORT_DIAL_DEBUG', 'SUPPORT_LWIP', 'CONFIG_BRANDY_BLE_TRANS_OPTIMIZE', 'MBEDTLS_NO_PLATFORM_ENTROPY', - 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'MARKET_ENABLE'], + 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'OH_MARKET_ENABLE', 'CONFIG_NATIVEAPP_TEST'], 'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", 'dfx_nv', "osal", "arch_port", "-:testsuite", "liteos_port", 'lcd', 'qspi_display', 'dfx_file_operation', - 'psram', 'hal_mipi', 'mipi_tx', 'non_os', 'touch', + 'psram', 'hal_mipi', 'mipi_tx', 'non_os', 'touch', 'ace_ble', 'ulp_aon', 'hal_l2ram', 'bt_manager_at_service', 'x_dpal', 'x_vfs', 'x_disk', 'x_fat', 'drv_mmc', 'fs_yaffs2', 'x_vfs_private', "cipher_static", 'pm_service', 'pm_brandy', 'cmn_header', 'at_cmd', 'graphic_at_service', 'app_at_service', 'ohosfwk_at_service', - "audio_proc", "audio_dump", "audio_probe", "power_manager", "gpu_proc",'bts_header','lwip', + "audio_proc", "audio_dump", "audio_probe", "power_manager", "gpu_proc",'bts_header','lwip', 'uart_agent', 'ace_kit_cipher_static'], 'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'alipay_set', 'msg_center_service'], # 如果没有定义ssb_version,默认使用brandy-ssb @@ -169,10 +169,10 @@ target = { 'SUPPORT_BLE', 'SUPPORT_BREDR', 'ENABLE_UIKIT', 'SUPPORT_GPU_JPEG', 'SUPPORT_GPU_GMMU', 'SUPPORT_GPU_OPENVG', 'CONFIG_DIAG_GPU_PROC_SUPPORT', 'SW_UART_DEBUG', 'SAVE_EXC_INFO', "HASH_MEM_COPY", 'JS_ENABLE', 'CONFIG_LOW_POWER_TEST', 'SUPPORT_OHOSFWK', 'ENABLE_ECC', 'XTS_SUPPORT', 'SUPPORT_ALIPAY_SEC', 'SUPPORT_RC_CALIBRATION', 'MBEDTLS_NO_PLATFORM_ENTROPY', - 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'MARKET_ENABLE'], + 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'OH_MARKET_ENABLE'], 'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", 'dfx_nv', "osal", "arch_port", "-:testsuite", "liteos_port", 'lcd', 'qspi_display', 'dfx_file_operation', - 'psram', 'hal_mipi', 'mipi_tx', 'non_os', 'touch', + 'psram', 'hal_mipi', 'mipi_tx', 'non_os', 'touch', 'ace_ble', 'ulp_aon', 'hal_l2ram', 'x_dpal', 'x_vfs', 'x_disk', 'x_fat', 'drv_mmc', 'fs_yaffs2', 'x_vfs_private', 'pm_service', 'pm_brandy', 'cmn_header', 'at_cmd', 'graphic_at_service', 'app_at_service', 'ohosfwk_at_service', @@ -248,8 +248,7 @@ target = { '_ALL_SOURCE', 'SUPPORT_CXX', 'I2C_SLAVE_REG_ADDR_4BYTE', 'CFG_DRIVERS_NANDFLASH', "-:TARGET_CHIP_BRANDY=1", "-:BRANDY_CHIP_V100=1", 'ENABLE_UIKIT', 'SW_UART_DEBUG', "HASH_MEM_COPY", 'ENABLE_ECC', 'SUPPORT_RECOVERY_DISPLAY', - - 'MBEDTLS_NO_PLATFORM_ENTROPY', 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'MARKET_ENABLE'], + 'MBEDTLS_NO_PLATFORM_ENTROPY', 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'OH_MARKET_ENABLE'], 'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", "osal", "arch_port", "-:testsuite", "liteos_port", 'lcd', 'qspi_display', 'dfx_file_operation', 'psram', 'hal_mipi', 'mipi_tx', 'non_os', 'touch', @@ -263,7 +262,7 @@ target = { 'defines': ['PRE_ASIC', 'BRANDY_PRODUCT_EVB4', 'VERSION_STANDARD', '__LITEOS__', '_ALL_SOURCE', 'SUPPORT_CXX', 'I2C_SLAVE_REG_ADDR_4BYTE', 'CFG_DRIVERS_NANDFLASH', "-:TARGET_CHIP_BRANDY=1", "-:BRANDY_CHIP_V100=1", 'ENABLE_UIKIT', 'SW_UART_DEBUG', "HASH_MEM_COPY", - 'ENABLE_ECC', 'MBEDTLS_NO_PLATFORM_ENTROPY', 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'MARKET_ENABLE'], + 'ENABLE_ECC', 'MBEDTLS_NO_PLATFORM_ENTROPY', 'MBEDTLS_ENTROPY_HARDWARE_ALT', 'OH_MARKET_ENABLE'], 'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", "osal", "arch_port", "-:testsuite", "liteos_port", 'lcd', 'qspi_display', 'dfx_file_operation', 'psram', 'hal_mipi', 'mipi_tx', 'non_os', 'touch', diff --git a/code/sdk/build/config/target_config/brandy/hdb_config/database_template/acore/system/diag/tool_fix_struct_def.txt b/code/sdk/build/config/target_config/brandy/hdb_config/database_template/acore/system/diag/tool_fix_struct_def.txt index a938d7adc..cf7fa57bb 100644 --- a/code/sdk/build/config/target_config/brandy/hdb_config/database_template/acore/system/diag/tool_fix_struct_def.txt +++ b/code/sdk/build/config/target_config/brandy/hdb_config/database_template/acore/system/diag/tool_fix_struct_def.txt @@ -202,7 +202,7 @@ typedef struct { td_u16 key; td_u16 crc; td_u32 length; - td_u8 value[0]; + td_u8 value[300]; } nv_write_input_t; typedef struct { diff --git a/code/sdk/build/config/target_config/brandy/mk_emmc_image/mkfatimg.exe b/code/sdk/build/config/target_config/brandy/mk_emmc_image/mkfatimg.exe index 91297d38f..40bcfcd07 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_emmc_image/mkfatimg.exe and b/code/sdk/build/config/target_config/brandy/mk_emmc_image/mkfatimg.exe differ diff --git a/code/sdk/build/config/target_config/common_config.py b/code/sdk/build/config/target_config/common_config.py index 21db45000..521abc466 100644 --- a/code/sdk/build/config/target_config/common_config.py +++ b/code/sdk/build/config/target_config/common_config.py @@ -74,7 +74,8 @@ component_set = { 'media_sample_wrapper', 'player', 'media_common', 'audio_bluetooth_port', 'audio_hw', 'audio_primary_port','format_hw', 'hmf_demuxer', 'media_hal_common', 'plugin_demuxer_hmf', 'plugin_demuxer_mjpeg', 'plugin_protocol_https', 'audio_port_common', 'codec_hw', 'codec_plugin_vdec', - 'camera_codec_hw', 'hdi_camera_intf', 'plugin_demuxer_raw', 'audio_modem_port', 'audio_decrypt', 'ogg'], + 'camera_codec_hw', 'hdi_camera_intf', 'plugin_demuxer_raw', 'audio_modem_port', 'audio_decrypt', 'ogg', + 'plugin_muxer_wav', 'dtcf', 'audio_recorder', 'dtcf_manager', 'plugin_muxer_raw', 'plugin_demuxer_ogg'], 'media_melody': ['audio_manager', 'audio_service', 'audio_stream', 'audio_utils', 'media_common', 'audio_bluetooth_port', 'audio_hw', 'audio_primary_port', 'media_hal_common', 'audio_port_common', 'haid_manager', 'tone_player', 'tws_manager'], @@ -88,7 +89,8 @@ component_set = { 'gpu': ['gfx_rm', 'gpu'], 'gpu_test': ['test_gpu'], 'graphic_uikit': ['cjson_static', 'display_gfx', 'display_gralloc', 'display_layer', 'graphic_input', 'graphic_service', - 'freetype_static', 'graphic_ui', 'graphic_utils', 'qrcodegen', 'icu4c', 'harfbuzz', 'uikit_ext'], + 'freetype_static', 'graphic_ui', 'graphic_utils', 'qrcodegen', 'icu4c', 'harfbuzz', 'uikit_ext','zlib_static', 'png_static', 'jpeg_static', + 'graphics_ui_traceui'], 'graphic_lvgl': ['display_gfx', 'display_gralloc', 'display_layer', 'graphic_input', 'freetype_static', 'lvgl', 'lvgl_sample', 'lvgl_demos', 'lvgl_proprietary', 'lvgl_service'], 'graphic_lvgl_mini': ['display_gfx', 'display_gralloc', 'display_layer', 'graphic_input', 'freetype_static', @@ -116,9 +118,11 @@ component_set = { 'efuse_v120': ['efuse', 'hal_efuse_v120', 'efuse_porting'], 'efuse_v100': ['efuse', 'hal_efuse_v100', 'efuse_porting'], 'efuse_v130': ['efuse', 'hal_efuse_v130', 'efuse_port'], - 'ohos_set' : ['bootstrap', 'samgr', 'ams', 'bms', 'bms_sign_mode', 'ace', 'ace_adapt', 'permission', 'appverify', 'jerryscript','js_player', 'js_audio_capturer', 'baidumapcomponent', 'brightness', 'ace_http', 'ace_websocket', 'i18n', 'netstack_http', 'websocket', + 'ohos_set' : ['bootstrap', 'samgr', 'ams', 'bms', 'bms_sign_mode', 'ace', 'ace_adapt', 'permission', 'appverify', 'jerryscript','js_player', 'js_audio_capturer', 'js_audio_recorder', + 'baidumapcomponent', 'brightness', 'netstack_http', 'websocket', 'i18n', 'ace_ext', 'ace_http', 'ace_websocket', 'ace_watchface', 'resmgr', 'syspara', 'utils_kv_store', 'native_file', 'storage_jsapi', 'svr_dynload', 'location_common', 'location_utils', 'locator_sdk', 'location_locator', 'location_gnss', 'location_gnss_hdi', - 'location_gnss_utils', 'location_gnss_emulator', 'location_sample', 'sensor_client', 'sensor_service', 'sensor_hdi', 'sensor_sample'], + 'location_gnss_utils', 'location_gnss_emulator', 'location_sample', 'sensor_client', 'sensor_service', 'sensor_hdi', 'sensor_sample', 'ace_calendar', 'sensor_hdi_acc_simulator', 'sensor_hdi_acc_alg_simulator', + 'sensor_hdi_barometer', 'sensor_hdi_gyroscope', 'sensor_hdi_hr_counter', 'sensor_hdi_pedometer', 'sensor_hdi_wear_detection'], 'wearable_set' : ['nativeabilityfwk', 'nativelauncher', 'ai_voice_service', 'ai_voice_engine_hal', 'ai_voice_audio_stream_wrapper', 'ohos_deps', 'broadcast', 'msg_center', 'msg_center_adapt', 'ohos_startup', 'uikit_fwk'], 'xts_set' : ["xts_adapt", "ohos_drv_v3.2", diff --git a/code/sdk/build/script/hdbxml/hso_prim_xml_merge.py b/code/sdk/build/script/hdbxml/hso_prim_xml_merge.py index 815f784a0..f25937577 100644 --- a/code/sdk/build/script/hdbxml/hso_prim_xml_merge.py +++ b/code/sdk/build/script/hdbxml/hso_prim_xml_merge.py @@ -69,7 +69,8 @@ def merge_db_xml(root, chip, core_name): msg_root_element.clear() filelist = os.listdir(os.path.join(base_dir, mod)) - for filename in filelist: + sorted_list = sorted(filelist) + for filename in sorted_list: tmp_xml_file = os.path.join(os.path.join(base_dir, mod), filename) tree = ElementTree() tree.parse(tmp_xml_file)