Repository navigation
Add a script to update the forks of AOSP sources - #1818
Open
adelva1984 wants to merge 3 commits into
Open
adelva1984 wants to merge 3 commits into
adelva1984 wants to merge 3 commits into
Conversation
adelva1984
force-pushed
the
aosp-update-script
branch
from
November 19, 2025 23:17
248476d to
cd2dafe
Compare
Databean
approved these changes
Nov 20, 2025
adelva1984
force-pushed
the
aosp-update-script
branch
2 times, most recently
from
November 20, 2025 23:25
3bf11ce to
101337f
Compare
For various code forked from AOSP, some changes have been made. Track them in numbered patch stacks.
adelva1984
force-pushed
the
aosp-update-script
branch
from
November 18, 2026 22:26
101337f to
a3e87f4
Compare
Various AOSP sources are fully copied and forked, and some are also patched. Make updating these files easier.
Import updated adb, fastboot, and fec sources from ToT AOSP
(android-latest-release) using base/cvd/update_aosp_sources.sh:
- Update adb (adding client/adb_wifi.h, openscreen/mdns_service.{cpp,h},
transport_mdns.h, usb_linux_netlink.{cpp,h}; removing old adb_wifi.h,
mdns_service_info.{cpp,h}, incfs/util/map_ptr.h), refresh
0002-drop-incremental-update.patch, and add patches to stub out the
Rust adbmdns backend and socket_local_client_timeout.
- Update fastboot (adding h2h_workaround.{cpp,h}) and add
0004-use-pinned-libbase-and-liblp.patch for compatibility with the
pinned @android_system_libbase and @android_system_core revisions.
- Update fec and add 0001-define-stringify-locally.patch to define
STRINGIFY locally without android-base/stringify.h.
Assisted-by: Jetski:gemini
adelva1984
force-pushed
the
aosp-update-script
branch
from
November 19, 2026 03:07
a3e87f4 to
ee43f4b
Compare
This branch has not been deployed
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.
Update and automate synchronization of the forked AOSP sources under
base/cvd/.Commits in this series
Add patches for non-upstream changes
Captures existing downstream Cuttlefish divergences from AOSP in numbered patch stacks for
adb(0001-drop-fastdeploy.patch,0002-drop-incremental-update.patch),fastboot(0001-restore-license-banner.patch,0002-drop-libziparchive-dependency.patch,0003-spell-string-view-the-absl-way.patch), andmkbootfs(0001-restore-license-banner.patch).Add a script to update the forks of AOSP sources
Adds
base/cvd/update_aosp_sources.shto stage, prune, preserve (BUILD.bazel,patches/, and project-specific stubbed/generated headers), and re-apply patches from an AOSP checkout, with guards against accidentally running against an internal Android tree.Update AOSP sources to android-latest-release
Runs
update_aosp_sources.shagainst ToT AOSP (android-latest-release) to updateadb,fastboot, andfec, updatesBUILD.bazelfiles for added/removed sources, refreshesadb/patches/0002-drop-incremental-update.patch, and adds patches foradb(0003-drop-adbmdns.patch,0004-drop-socket-local-client-timeout.patch),fastboot(0004-use-pinned-libbase-and-liblp.patch), andfec(0001-define-stringify-locally.patch) to keep compatibility with the pinned@android_system_libbaseand@android_system_corerevisions.