From 19f1af57fdc660681232b50a32e265a2e9a925c2 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Wed, 17 Jun 2026 16:14:27 +0200 Subject: [PATCH] Use Android platform services in retained package builds --- android/android/CMakeLists.txt | 2 +- android/focus/CMakeLists.txt | 2 +- android/quest/CMakeLists.txt | 2 +- docs/modernization/debt.md | 8 ++++++++ docs/modernization/roadmap.md | 10 ++++++++++ docs/modernization/tasks.md | 11 +++++++++++ 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/android/android/CMakeLists.txt b/android/android/CMakeLists.txt index a870ad47..05dbb71a 100644 --- a/android/android/CMakeLists.txt +++ b/android/android/CMakeLists.txt @@ -56,7 +56,7 @@ set(PP_MODERN_COMPONENT_SOURCES ../../src/platform_api/network_tls_policy.cpp ../../src/platform_api/platform_policy.cpp ../../src/platform_api/platform_services.cpp - ../../src/platform_legacy/legacy_platform_services.cpp + ../../src/platform_android/android_platform_services.cpp ../../src/renderer_api/recording_renderer.cpp ../../src/renderer_api/renderer_api.cpp ../../src/renderer_api/shader_catalog.cpp diff --git a/android/focus/CMakeLists.txt b/android/focus/CMakeLists.txt index dca33956..f439ca07 100644 --- a/android/focus/CMakeLists.txt +++ b/android/focus/CMakeLists.txt @@ -50,7 +50,7 @@ set(PP_MODERN_COMPONENT_SOURCES ../../src/platform_api/network_tls_policy.cpp ../../src/platform_api/platform_policy.cpp ../../src/platform_api/platform_services.cpp - ../../src/platform_legacy/legacy_platform_services.cpp + ../../src/platform_android/android_platform_services.cpp ../../src/renderer_api/recording_renderer.cpp ../../src/renderer_api/renderer_api.cpp ../../src/renderer_api/shader_catalog.cpp diff --git a/android/quest/CMakeLists.txt b/android/quest/CMakeLists.txt index c900c80e..6c7fc139 100644 --- a/android/quest/CMakeLists.txt +++ b/android/quest/CMakeLists.txt @@ -58,7 +58,7 @@ set(PP_MODERN_COMPONENT_SOURCES ../../src/platform_api/network_tls_policy.cpp ../../src/platform_api/platform_policy.cpp ../../src/platform_api/platform_services.cpp - ../../src/platform_legacy/legacy_platform_services.cpp + ../../src/platform_android/android_platform_services.cpp ../../src/renderer_api/recording_renderer.cpp ../../src/renderer_api/renderer_api.cpp ../../src/renderer_api/shader_catalog.cpp diff --git a/docs/modernization/debt.md b/docs/modernization/debt.md index 146578cc..d58b0ea9 100644 --- a/docs/modernization/debt.md +++ b/docs/modernization/debt.md @@ -18,6 +18,14 @@ agent or engineer to remove them without reconstructing context from chat. ## Reductions +- 2026-06-17: `DEBT-0017` was narrowed again. The retained Android package + CMake projects now compile `src/platform_android/android_platform_services.cpp` + instead of `src/platform_legacy/legacy_platform_services.cpp`, matching the + Android entrypoint's existing concrete `create_platform_services(...)` path. + The retained standard package link gate still fails, but the same package + build also fails after restoring the old legacy source list, so that linker + failure is currently tracked as preexisting noise rather than a regression + from this slice. - 2026-06-17: `DEBT-0017`/`DEBT-0055` were narrowed again. `src/platform_legacy/legacy_platform_services.*` is no longer compiled into the root `panopainter_app` source graph. The retained shim still exists on diff --git a/docs/modernization/roadmap.md b/docs/modernization/roadmap.md index c78c7c3f..6ba6134e 100644 --- a/docs/modernization/roadmap.md +++ b/docs/modernization/roadmap.md @@ -70,6 +70,16 @@ What is already real: - `pp_app_core` Latest slice: +- `android/android/CMakeLists.txt`, `android/quest/CMakeLists.txt`, and + `android/focus/CMakeLists.txt` now compile + `src/platform_android/android_platform_services.cpp` instead of + `src/platform_legacy/legacy_platform_services.cpp`. +- The retained Android package graphs now match `android/src/cpp/main.cpp`, + which already constructs concrete Android `PlatformServices` directly. +- The retained standard Android package link gate still fails after this slice, + but it also fails after restoring the old legacy source list, so the current + retained-package linker break remains preexisting and outside the behavior + change of this swap. - `cmake/PanoPainterSources.cmake` no longer adds `src/platform_legacy/legacy_platform_services.*` to `PP_PANOPAINTER_APP_SOURCES`, so the root `panopainter_app` target graph diff --git a/docs/modernization/tasks.md b/docs/modernization/tasks.md index 9413d8fb..85d6ea56 100644 --- a/docs/modernization/tasks.md +++ b/docs/modernization/tasks.md @@ -84,6 +84,17 @@ Completed, blocked, and superseded task history moved to the queue is now ordered by code movement instead. Current slice: +- `android/android/CMakeLists.txt`, `android/quest/CMakeLists.txt`, and + `android/focus/CMakeLists.txt` now compile + `src/platform_android/android_platform_services.cpp` instead of the retained + `src/platform_legacy/legacy_platform_services.cpp` shim. +- The retained Android package graphs now match the concrete Android + `create_platform_services(...)` path already used in + `android/src/cpp/main.cpp`. +- The retained standard Android package link gate still fails, but restoring + the old legacy source list reproduces a different unresolved-symbol link + failure too, so the package linker break is treated as preexisting noise for + this narrow source-list swap. - `cmake/PanoPainterSources.cmake` no longer adds `src/platform_legacy/legacy_platform_services.*` to `PP_PANOPAINTER_APP_SOURCES`.