author B2G Bumper Bot <>
Sat, 12 Jul 2014 00:06:51 -0700
changeset 193648 3028afb6e20f38de2b82acf278484ef8707643d3
parent 192432 72a70862ee28461fbfcda067f508862d9e22d0f3
child 204609 589752703e0cc9c461dd61f786cacd483e298766
permissions -rw-r--r--
Bumping manifests a=b2g-bump

This is the ANGLE project, originally from 

The Mozilla upstream is the 'mozilla' branch from, which
includes Mozilla-specific patches on top of upstream.

=== How to upgrade ANGLE ===

1. git clone angle

2. Go into the angle dir, and add the google upstream as a remote:
     git remote add google

3. Fetch the new google upstream:
     git fetch google

4. Switch to the mozilla branch
     git checkout mozilla

5. Rebase the mozilla branch on top of the new google master.  Fix up patches along the way,
   remove unneded commits.
     git rebase -i google/master

6. Re-generate files:

7. nuke mozilla-central/gfx/angle directory

8. copy all the relevant files from the github checkout
     cd mozilla-central
     mkdir gfx/angle
     cp -r /c/proj/angle/[A-Z]* /c/proj/angle/{include,src,} gfx/angle

9.  Build. Fix things until it builds.

10. Try runs and reviews!