Skip to content

Sync fork with upstream main and preserve Android resolver fixes - #14

Merged
mixxer merged 72 commits into
mainfrom
fork/sync-upstream-2026-09-28
Sep 27, 2026
Merged

mixxer merged 72 commits into
mainfrom
fork/sync-upstream-2026-09-28

Conversation

@mixxer

@mixxer mixxer commented Sep 27, 2026

Copy link
Copy Markdown
Owner

Scope

Bring fork main (61224b6) up to upstream main (e63fe2e) in a separate integration branch. This includes the current upstream PR colbymchenry#1927, colbymchenry#1928, and colbymchenry#1929 changes already maintained in this fork, while retaining the Java static-field work from upstream colbymchenry#1949 and the fork's Kotlin follow-up. Fork main is unchanged until this PR passes CI and is reviewed.

Conflict resolution

Validation

  • Node 24 build passed.
  • Focused portable suites: 449 passed, 1 skipped.
  • Native kernel built. Focused native parity and resolver suites: 320 passed; function-ref.test.ts: 31 passed after the Go fix.
  • A full native suite before the Go fix had 5,481 passed, 23 skipped, 2 Go method-value failures. The focused suite passes after the fix; CI must validate the complete final tree.
  • Reindexed public Play Framework Java source at e1f3c2a92be8aa8b2f853d7d3175955efbe18a1e with this branch. The cited Integer.TYPE.equals and XMLConstants.DEFAULT_NS_PREFIX.equals locations have no incorrect call edge. This source set does not establish the vendor SystemUI 37-row diff; the request for that diff and its boundaries remains open on upstream fix(java): resolve calls through static fields colbymchenry/codegraph#1949.

Please keep this PR open until its Node 22/24 and native AOSP checks complete.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants