fix(m40): 评审 r1 — rebase 解冲突 + 宿主构建/可复验断言(无运行逻辑改动)
- rebase 到 main(b1acc90,含 M39 r1):fw_content.conf 冲突取 launcherd 605e13a9、
watchdog 37c57e0f;nyai 保持 main 的 ef7940ec(M39 6c6da79 已修,本单不再改该行)
- build_ncm_host.sh:SDK_SRC 补 meow_time32(否则链接 U meow_time32_monotonic_ms);
顺带补 meow_jpeg/meow_png_stream/meow_img_color,脚本端到端可构建
- build_sdk.sh / build_launcher.sh 加 -Wall -Wextra 并重编:0 warning,产物 md5 不变
(meow_ui.a=86800633、meow_launcherd=605e13a9)
- 新增 sdk/test_time32_abi.sh:反汇编断言 4263≥1、4403=0(覆盖宿主 fallback 测不到的真机路径)
- 注释修正 sdk/meow_ui_repaint.c → .h
- P1-1(launcherd 只能刷固件;watchdog 可热更但需退出重进 App)为交付说明修正,无代码改动
This commit is contained in:
1 parent
63b278e13e
commit
340c41afb7
7 files changed
+55
-5
No files matched your search
@@ -346,3 +346,14 @@ bash build_watchdog.sh host # time32 取时/睡眠 + 电源阈值矩阵
|
||||
cd ../sdk
|
||||
gcc -Wall -Wextra -I. test_meow_repaint.c -o /tmp/tr && /tmp/tr
|
||||
```
|
||||
|
||||
宿主(非 mips o32)走的是 `MEOW_TIME32_KERNEL_ABI=0` 的 libc 回退分支,所以「取时与 libc 一致」
|
||||
在宿主恒真;**真机取时路径由反汇编断言兜底**(不只看报文):
|
||||
|
||||
```
|
||||
bash patch_v2/sdk/test_time32_abi.sh \
|
||||
patch_v2/meow_watchdog/meow_watchdog patch_v2/meow_launcherd/meow_launcherd
|
||||
# 要求每个二进制:4263(0x10a7) ≥1 处、4403(0x1133) = 0 处
|
||||
```
|
||||
|
||||
M40 起 `build_sdk.sh` 与 `build_launcher.sh` 也带 `-Wall -Wextra`(0 warning 可复验)。
|
||||
Reference in new issue
Block a user