ObliviOS Developer portal Project site

Home / Decisions / ADR-099

Move the upstream baseline from GrapheneOS manifest tag 2026071500 to 2026091900.

Accepted, recorded 25 September 2026.

Decision
ADR-099
Date
2026-09-25
Status
AcceptedAccepted, 2026-09-27. Built, signed (ADR-103), flashed (fastboot flash modem then fastboot flashall, no -w), and booted clean on the owner's physical lynx: adb confirmed fingerprint google/lynx/lynx:17/CP2A.260705.006/2026092501:userdebug/release-keys, baseband g5300q-260604-260807-B-16036236, verifiedbootstate=orange, only user 0 (decoy removed pre-flash), 0 crash/ANR/tombstone entries, 3 min uptime. 2026091900 is now the accepted baseline; 2026071500 stays available via the old sovereignos-* branches for rollback. Emulator boot in out-preflight was not done — skipped in favor of the real hardware result.
Mentions
ADR-001, ADR-029, ADR-096, ADR-097, ADR-098, ADR-103
Mentioned by
ADR-100, ADR-104, ADR-105, ADR-166

1Decision

Move the upstream baseline from GrapheneOS manifest tag 2026071500 to 2026091900 (signature verified, AOSP base unchanged at android-17.0.0_r1), by an in-place repo sync of the existing platform-primary tree, with the SovereignOS patch packages re-applied on top. First upstream update this project has done; ADR-001's "must track upstream releases" and docs/research/upstream-dependency-map.md's "a later upstream security release requires a new decision-log entry and the same verification process" are the basis.

2Why and evidence

A second source tree does not fit (/srv had 66 GB free, the tree is 407 GB of which two old out-* dirs are 243 GB).

Rollback therefore rests on: a frozen repo manifest -r snapshot plus per-project HEADs and local branch heads taken before the sync; repo sync -d -c (-d detaches HEAD to the new revision; without it repo would try to rebase the local aegisos-* overlay branches that every patched project is currently checked out on, which -d leaves untouched; the tree is a blob:none partial clone with preciousObjects=true, so old objects are not pruned).

The snapshot was taken 2026-09-25 (server evidence dir pre-update-20260925-174843: 1108 project HEADs, 12 local branches, tree clean, sha256sum -c re-verified).

Afterwards, before the sync, the 11 aegisos-* overlay branches were renamed to sovereignos-* (same SHAs; branch-rename-map.txt in that evidence dir; branches.txt there keeps the pre-rename names; backup/task4-pre-identity-fix unchanged; all 1108 HEADs re-verified identical afterwards). Older records and SOURCE.md files keep the old names as history, per ADR-097.

Sync done 2026-09-25: repo sync -d -c -j4 --no-tags to 2026091900; 16 projects GrapheneOS had renamed needed --force-sync (owner-approved, only those 16, git dirs backed up first); all 1057 manifest projects verified at their manifest revision, 12 branches intact, tree clean.

Patches applied 2026-09-25: 27 patch files (sovereignos-platform 366037c) applied with git am --3way on new per-project branches sovereignos-2026091900, all 9 project trees identical to a local dry-run on the same revisions; lynx vendor module regenerated 2026-09-25 with adevtool generate-all -d lynx (base build stays CP2A.260705.006; CP3A.260905.009 is only the carrier-settings/radio backport at this tag; bootloader unchanged, baseband changes to g5300q-260604-260807-B-16036236; the previous module is backed up on the server; a first run with a wrong -b override failed and is recorded in the provenance); lynx build done 2026-09-26 (lynx-cur-userdebug, BUILD_NUMBER=2026092501, no ccache; first run failed at 99% in check_current_api because the ADR-097 rename left USER_TYPE_FULL_SOVEREIGNOS_DECOY in the wrong sorted position in system-current.txt; fixed in sovereignos-platform 6a69cd2, second run BUILD_EXIT=0; all four official apps found in the per-partition installed-files*.txt; signed and flashed 2026-09-27, see ADR-103 and this row's own updated status; the old sovereignos-* branches stay as rollback (details in sovereignos-manifest/provenance/2026091900.md); the existing candidate artifacts in unsigned/, signed/ and evidence/ staying untouched; and the build reusing the same OUT_DIR path (a differing OUT_DIR was a root cause of non-reproducibility in ADR-029).

Pre-sync impact analysis (upstream file lists vs. files touched by our patches): 77 of 1108 projects change revision; all patched projects except device/generic/goldfish change; file-level overlap is 6 of 49 files in frameworks/base (ActivityManagerService, UserManagerService, ActivityManagerInternal, StorageManagerService, NotificationManagerService, core/api/system-current.txt) and 2 of 14 in packages/apps/Settings (Utils.java, DeviceAdminAdd.java), none in system/core, system/sepolicy, packages/apps/Updater, build/make, vendor/adevtool (checked against the one patched file).

File overlap predicts where conflicts can occur, not that they will; real conflict status is only known after git am.

3Consequences

The vendor module must be regenerated with adevtool because its version pin follows the vendor/adevtool HEAD (corrected 2026-09-25: this note first claimed the base build moves to CP3A.260905.009; the adevtool device config at this tag keeps base CP2A.260705.006 and only backports carrier settings and radio firmware from CP3A.260905.009), and the new radio firmware must be flashed by the owner. 51 projects leave the manifest (Car/TV apps, 28 prebuilts/module_sdk/*); the sync removes their worktrees. The 13 squashed duress-decoy patches have never been applied to any tree except the one they came from (ADR-098's own review trigger).

4Review when

Any patch fails to apply or a conflict resolution changes a patch's behaviour (re-review that patch); build or installed-files.txt check fails; boot or ADR-096-class hardware checks regress on lynx; disk falls below the preflight floor.

Read from docs/governance/decision-log.md, entry ADR-099.