oxmc
af29205167
The recovery_toolkit/recovery_ui merge broke ninja generation for the whole tree (everything runs at analysis time, even for modules nothing builds). Fixes, in the order the errors surfaced: - BoardConfigSoong.mk: export TW_THEME=landscape_hdpi via the twrpVarsPlugin soong config namespace (RPi 4/5 are 1080p HDMI); libguitwrp's theme selection hard-exits analysis when unset - soong/copy.go: re-anchor runtime.Caller path derivation — the 'bootable' anchor never matches at vendor/pawlet/recovery_ui and the slice paniced; recovery dir is now derived relative to this file - scrypt sources.bp + libpixelflinger: hoist arch.arm.neon.* contents into plain arm blocks — the neon variant was removed in android-16 Soong (NEON is mandatory on armv7-a+) - recovery_ui/Android.bp: port twrp_defaults verbatim from android_vendor_twrp (android-14.1, build/soong) — it never lived in bootable/recovery; pure soong_config machinery, contributes no flags until twrpGlobalVars vars are set - gui/Android.bp: drop libaosprecovery from libguitwrp's shared_libs — the module doesn't exist (TWRP's forked install/*.cpp was never ported) and an undefined dep is analysis-fatal; compile is unaffected (static lib), the gap moves to link time and is documented - recovery_ui/Android.bp: librecovery_ui_pawlet_twrp shared -> static (librecovery_ui_ext absorbs TARGET_RECOVERY_UI_LIB via whole_static_libs) and libpixelflinger_twrp moved to static_libs - scrypt Android.bp + libminuitwrp_defaults.go: rewrite leftover bootable/recovery/* self-referential paths to the new vendor/pawlet locations Requires the libminadbd_headers visibility patch in the patches repo. m nothing now completes for pawlet_rpi4-bp4a-userdebug.
recovery_toolkit
TWRP's partition manager, backup engine, filesystem/format support, and
scripting/automation tooling — the "standalone additive" bucket from the
TWRP-vs-stock-recovery diff (confirmed via source grep: zero references
either direction between this code and recovery.cpp/install/install.cpp,
so none of it requires forking stock bootable/recovery). See the main
workspace's NOTES-ota-recovery-ab.md for the full investigation.
Source copied verbatim from TeamWin's android_bootable_recovery
(android-14.1), the only living copy found (Google removed the equivalent
functionality's siblings — applypatch/updater/edify — from stock AOSP
in 2024; see external_update_binary).
Status: source staged, no build files yet
This is source-only. None of these directories have an Android.bp yet.
That's real remaining work, not cleanup — each of these historically had its
module definition scattered inside TWRP's single top-level
bootable/recovery/Android.bp, not self-contained per-directory the way
applypatch/updater/edify were, so each needs a new Android.bp
written from scratch, not just copied and path-fixed.
Layout
partitionmanager/—partition.cpp,partitionmanager.cpp,partitions.hpp,BasePartition.cpp.backup/—twrpTar.*,tarWrite.*,twrpDigestDriver.*,twrpAdbBuFifo.*,twrpApex.*,infomanager.*, pluslibtar/,twrpDigest/,adbbu/,twrpTarMain/(each of those four already has its own directory structure from upstream, not yet inspected for existing build files).- Filesystem/format support:
exfat/,dosfstools/,libblkid/,simg2img/,minzip/,openaes/,gpt/,fuse/(+fuse.h),mtp/,crypto/. scripting/(openrecoveryscript.*) +orscmd/+twrpinstall/— TWRP's scripting/automation interface.twrpinstall/is referenced byrecovery_ui/gui/Android.bp'sinclude_dirsalready (this module needs to exist beforerecovery_uican build).helpers/— shared utilities (find_file.*,exclude.*,fixContexts.*,mounts.c,startupArgs.*,progresstracking.*,kernel_module_loader.*,abx-functions.hpp,twrp-functions.*,twrp.cpp), pluslibcrecovery/,libmincrypt/,attr/.
Known gap shared with recovery_ui
helpers/twrp.cpp needs to build into libaosprecovery — TWRP builds this
via a custom Go Soong plugin (libaosprecovery_defaults.go, not yet
copied/ported) that recovery_ui/gui's libguitwrp depends on as a
shared_libs entry. recovery_ui won't link until this exists.
Priority if picking up this work
twrpinstall/ and helpers/ (for libaosprecovery) block recovery_ui
from building at all — do those first. partitionmanager/ and backup/
are the actual user-facing value (what makes this "TWRP" rather than just a
GUI skin) and are next. Filesystem/format support modules
(exfat/dosfstools/etc.) can come last — they're each independent and
only needed for the specific formats they support.
License
GPL-3.0 (TeamWin) — same situation as recovery_ui, full license text not
yet added to this repo.