Loop over llvm, clang, compiler-rt (in this order):
Do a squashed merge of aosp/dev to aosp/master.
repo start update . git fetch aosp dev git merge --squash aosp/dev git commit -a repo upload .
Test everything before submitting the patch from the previous step.
Grab the squashed commit and replay it in aosp/dev.
repo sync . git remote update git branch -D clean_master git checkout -b clean_master aosp/master git checkout working_dev
-s ours to ensure that we skip the squashed set of changes. If/when we forget this, we have to do it later.
git merge -s ours clean_master git push aosp refs/heads/working_dev:refs/heads/dev git branch -D clean_master
Clean up after our working branch.
git checkout --detach git branch -D working_dev
This works better because we can keep full history in aosp/dev, while maintaining easy reverts/commits through aosp/master.
Iteratively attempt to build the platform and fix any API differences in frameworks/compile/slang, and/or frameworks/compile/libbcc. This may entail updating the various snapshots of Bitcode Readers/Writers.
Update RenderScript prebuilts.
cd $ANDROID_BUILD_TOP/frameworks/rs ./update_rs_prebuilts.sh
The prebuilts get copied to prebuilts/sdk, so we must upload the relevant bits from there.
cd $ANDROID_BUILD_TOP/prebuilts/sdk git commit -a repo upload .
./android_test.sh(no known failures as of 2015-10-08).
The following projects will almost always have CLs as a part of the rebase. Depending on the changes in LLVM, there might be updates to other projects as well.