[tools] Support current and legacy assembly stores#12104
Open
simonrozsival wants to merge 4 commits into
Open
Conversation
Teach the assembly store reader to locate CoreCLR stores through the exported _assembly_store symbol while retaining the MonoVM payload-section fallback. Reuse the modern reader from decompress-assemblies without dropping legacy store support. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 55493571-86e2-4326-850e-ea55883aa5d8
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the inspection/decompression tooling to support the current CoreCLR assembly-store layout by locating the store via the exported _assembly_store ELF symbol (with a fallback to the legacy payload section), and wires that into decompress-assemblies so it can correctly extract assemblies from modern APK/AAB layouts under lib/{ABI}/libassembly-store.so. It also factors the v2 reader into a reusable library and ensures decompression failures propagate via the tool exit code.
Changes:
- Add ELF
_assembly_storesymbol lookup (withpayloadsection fallback) to the mk2 assembly-store reader. - Split the mk2 reader into a reusable
AssemblyStorelibrary and consume it from both the mk2 CLI anddecompress-assemblies. - Update
decompress-assembliesto handle both legacyassemblies/assemblies.bloband currentlib/{ABI}/libassembly-store.sostores, and to return non-zero on failures.
Show a summary per file
| File | Description |
|---|---|
| tools/decompress-assemblies/main.cs | Adds support for extracting from current lib/{ABI}/libassembly-store.so stores (plus better failure propagation), while keeping legacy store and individual-entry paths. |
| tools/decompress-assemblies/decompress-assemblies.csproj | Adds a project reference (with alias) to the mk2 AssemblyStore library and the Android SDK tools dependency needed for ABI/arch handling. |
| tools/assembly-store-reader-mk2/Main.cs | Removes redundant file-format/existence checks now handled by AssemblyStoreExplorer.Open. |
| tools/assembly-store-reader-mk2/Directory.Build.targets | Copies the launch script only for executable builds and makes the script path resolution robust via $(MSBuildThisFileDirectory). |
| tools/assembly-store-reader-mk2/AssemblyStore/Utils.cs | Implements _assembly_store dynamic symbol-based payload discovery with fallback to payload section scanning. |
| tools/assembly-store-reader-mk2/AssemblyStore/StoreReader_V2.cs | Uses the new ELF payload discovery API and improves the error message for invalid _assembly_store symbols. |
| tools/assembly-store-reader-mk2/AssemblyStore/ELFPayloadError.cs | Adds an error value for invalid payload symbols. |
| tools/assembly-store-reader-mk2/AssemblyStore/AssemblyStoreItem.cs | Makes AssemblyStoreItem public to support external consumers. |
| tools/assembly-store-reader-mk2/AssemblyStore/AssemblyStoreExplorer.cs | Makes AssemblyStoreExplorer public and updates the “no entries found” error message. |
| tools/assembly-store-reader-mk2/AssemblyStore/AssemblyStore.csproj | Introduces a dedicated reusable library project for the mk2 reader implementation. |
| tools/assembly-store-reader-mk2/assembly-store-reader.csproj | Switches the CLI to consume the new library project instead of compiling the sources directly. |
Copilot's findings
- Files reviewed: 11/11 changed files
- Comments generated: 0
Member
|
/review |
Contributor
|
✅ Android PR Reviewer completed successfully! |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
⚠️ Needs Changes
Nice, well-structured follow-up that revives decompress-assemblies for symbol-based (libassembly-store.so) stores while preserving the legacy assemblies.blob and individual-entry paths, plus threading failures through the exit code. The ELF _assembly_store symbol resolution with a payload-section fallback is clean, and the 32/64-bit bounds checks are careful.
Issues (see inline comments):
⚠️ 1 error-handling:GetAndroidAbican throwNotSupportedExceptionforNone/Mips/Otherarchs (which pass theHasValueguard), crashing the tool instead of propagating a non-zero exit code — the opposite of one of this PR's goals.- 💡 2 suggestions: arch→ABI mapping duplicates
MonoAndroidHelper; and a diagnostic log for the zero-size symbol fallback.
Verification notes:
- CI is still pending on the head commit — not green yet, so not mergeable until checks pass.
- The retained
FindELFPayloadSectionOffsetAndSizewrapper is correctly kept for its build-task/test caller (ArchiveAssemblyHelper.cs), which now transparently gains symbol-based resolution. - Re: the PR's open question about deleting
decompress-assemblies— that's a reasonable call for maintainers; nothing in this diff blocks either decision.
No blocking correctness issues beyond the unhandled-exception path above.
Generated by Android PR Reviewer for #12104 · 112.5 AIC · ⌖ 18.8 AIC · ⊞ 6.8K
Comment /review to run again
Unify the legacy v1 parser with the modern reader, recognize v2 and v3 store layouts and archive names, and decode both XALZ/LZ4 and XAZS/Zstd assemblies. Add a standalone compatibility matrix and run it in CI. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 55493571-86e2-4326-850e-ea55883aa5d8
simonrozsival
changed the title
Use MonoAndroidHelper as the ABI source of truth, report unsupported store architectures without throwing, and log when zero-sized ELF symbols fall back to the containing section size. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 55493571-86e2-4326-850e-ea55883aa5d8
simonrozsival
added a commit
that referenced
this pull request
Jul 14, 2026
Keep the file-app project removals while incorporating the shared ELF symbol diagnostic changes from the compatibility branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 55493571-86e2-4326-850e-ea55883aa5d8
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
Contributor
Resolved in |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
_assembly_storeELF symbol while retaining the MonoVMpayloadsection fallbackXALZ/LZ4 andXAZS/Zstd compressed assembliesdecompress-assemblieswithout dropping direct DLL or individual-entry handlingThis follows up on #12033 (comment).
Compatibility
The reader now detects the archive layout, ELF wrapper, store format, and compression format independently:
assemblies/assemblies.blob;libassemblies.{abi}.blob.so;libassembly-store.sopayloadsection; exported_assembly_storesymbolXALZ/LZ4;XAZS/ZstdLegacy common assemblies are included in each ABI-specific view, matching the original store-set behavior.
Follow-up
A separate stacked PR will simplify the standalone tool projects into .NET file-based apps and introduce skills that invoke them for customer APK inspection and extraction. The shared compatibility parser remains in the repository because build/device tests and external projects consume or track it.
Validation
tmt