# aosp-merger ### Usage Simply run the script from source top as follows: `./scripts/aosp-merger/aosp-merger.sh (--delete-staging) (--push-staging) (--reset-original) (--diff) (--check) ` * both `` and `` are always required * when using flags the script will perform the action(s) and exit * set `DEFAULTBRANCH` to the default remote branch name * set `DEFAULTREMOTE` to the default remote name * set `WAIT_ON_CONFLICT` to `true` or `false` according to preference * set `MANIFEST` var to the path of the manifest xml to search * set `DEFAULT_MANIFEST` var to the path of aosp manifest * add repos *paths* that should not be upstreamed to `merge_blacklist.txt` - separated by newline ### Description The script will go over the manifest file and try to merge the chosen AOSP tag for any repo that is being tracked from `DEFAULTREMOTE` and is not in `merge_blacklist.txt` A log of actions will be saved to the source top dir at `merged_repos.txt` (see [this](#log-entries)) Previously checked out branches will be saved to the source top dir at `saved_branches.list` Any non pushed repos will be checked out to a staging branch ### Flags ##### --delete-staging Will remove the staging branch for the given AOSP tag and exit ##### --push-staging Will push (to the set default remote and branch / saved branches in `saved_branches.list`) and remove the remaining staging branches, while prompting one by one ##### --cleanup Runs git gc on the relevant repos. Should help save some space after the AOSP tags are deleted ##### --reset-original Will reset all original local branches to the new pushed heads after a merge. Will also delete staging branches if any are still there ##### --diff Will show the diff between the two tags, offer to save to a file and exit Do note the resulting output &/ file can get huge ##### --check Performs a sanity check for the merge using `merged_repos.txt` Will summarize errors, warnings and exit ### Log entries ##### Positive * `nochange `: There was no change from previous tag * `clean `: Merged with no conflicts * `solved `: Merged after solving conflicts * `pushed `: Merge was pushed ##### Negative * `conflict `: Conflicts in merge were not solved (kept for later) * `invalid `: AOSP remote is not valid or the repo doesn't even exist there * `fail `: Merge failed (& was skipped by the user)

c	File Name	Size	T	Date
-	README.md	2446	md	2026-10-26 17:17:11
-	aosp-merger.sh	24096	sh	2026-10-26 17:17:11
-	merge_blacklist.txt	69	txt	2026-10-26 17:17:11

🌲 / android-build build yaap scripts aosp-merger

control-panel