diff --git a/build.gradle b/build.gradle index ca3cc67b..75e35afd 100644 --- a/build.gradle +++ b/build.gradle @@ -42,14 +42,19 @@ android { defaultConfig { minSdk 26 - if (standalonePluginBuild) { - ndk { + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + // One ndk block for both shapes: a standalone plugin build follows the caller's + // ABI set, while the FCL-embedded library pins arm64-v8a - FCL packages that ABI + // alone, so the wider default set would only build libraries nothing loads. + ndk { + if (standalonePluginBuild) { abiFilters.addAll(mobileGlAbiFilters()) + } else { + abiFilters.add('arm64-v8a') } } - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - externalNativeBuild { cmake { arguments "-DMOBILEGL_LOG_ACTIVE_LEVEL=${mobileGlLogActiveLevel()}" diff --git a/docs/Disaggregated/notes/p5f/HANDOFF-P5F.md b/docs/Disaggregated/notes/p5f/HANDOFF-P5F.md index 23879787..0d2f6323 100644 --- a/docs/Disaggregated/notes/p5f/HANDOFF-P5F.md +++ b/docs/Disaggregated/notes/p5f/HANDOFF-P5F.md @@ -1,5 +1,8 @@ # P5f 交接:已全部收官 +> **后续 CI / 全量 inproc 工作尚未完成,已按用户要求停止(2026-09-20)。** +> 最新接续点见 [CI / inproc 交接](HANDOFF-CI-INPROC-20260920.md):实现树停在 `70c8230b`,尚未合并或 push;完整 inproc retrace 为 67/77,另有一个新增 GLES view mip 回归未解决。下文“已收官”仅指此前 P5f 范围,不能作为本轮 CI 全绿证明。 + > 2026-09-20。交付 worktree: > `C:/Users/geekerwan/AndroidStudioProjects/FoldCraftLauncher/MobileGL-disagg`,分支 `feat/disaggregated`。 > 完整结果见 [close-report.md](close-report.md),设备见 [device-report.md](device-report.md),