Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230
authorCaisking <3449750381@qq.com>
Mon, 27 Nov 2023 09:07:09 +0000 (17:07 +0800)
committerCaisking <3449750381@qq.com>
Mon, 27 Nov 2023 09:07:09 +0000 (17:07 +0800)
commit3e884353f47ae9edfdda1610057bc97b1b8ec2d0
tree659c084c8fc8d191f51761586173fa1453f73b5b
parentfa39815bd1bddf0b8e4972e3658ebe81db78e652
parentff8ceef9c06d6200d45c20575e31d2ea8634739b
Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230

# Conflicts:
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a
# code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a
# code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a
# code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a
# code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a
# code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a
# code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin
code/sdk/application/wearable/nativeapp/CMakeLists.txt