| OLD | NEW |
| 1 # Hacking on ANGLE in Chromium | 1 # Hacking on ANGLE in Chromium |
| 2 | 2 |
| 3 In DEPS, comment out the part that looks like this. | 3 In DEPS, comment out the part that looks like this. |
| 4 | 4 |
| 5 ``` | 5 ``` |
| 6 # "src/third_party/angle": | 6 # "src/third_party/angle": |
| 7 # Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"), | 7 # Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"), |
| 8 ``` | 8 ``` |
| 9 | 9 |
| 10 Delete or rename third\_party/angle. | 10 Delete or rename third\_party/angle. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 To check ANGLE builds (assumes you ran hooks with GYP\_GENERATORS=ninja) without | 26 To check ANGLE builds (assumes you ran hooks with GYP\_GENERATORS=ninja) without |
| 27 building all of Chromium. | 27 building all of Chromium. |
| 28 | 28 |
| 29 ```shell | 29 ```shell |
| 30 ninja -C out\Release libEGL.dll | 30 ninja -C out\Release libEGL.dll |
| 31 ``` | 31 ``` |
| 32 | 32 |
| 33 Change files then commit locally. | 33 Change files then commit locally. |
| 34 | 34 |
| 35 Upload to gerrit for review. You will need to have installed the git hook as | 35 Upload to Gerrit for review. You will need to have installed the git hook as |
| 36 described in the "Getting started with Gerrit for ANGLE" section of the | 36 described in the "Getting started with Gerrit for ANGLE" section of the |
| 37 ContributingCode doc before committing them locally. | 37 ContributingCode doc before committing them locally. |
| 38 | 38 |
| 39 ```shell | 39 ```shell |
| 40 git cl upload | 40 git cl upload |
| 41 ``` | 41 ``` |
| 42 | 42 |
| 43 As with subversion and rietveld: visit the upload link for the review site, | 43 As with subversion and Rietveld: visit the upload link for the review site, |
| 44 check the diff and the commit message then add reviewer(s) and publish. | 44 check the diff and the commit message then add reviewer(s) and publish. |
| 45 | 45 |
| 46 Land your changes to the upstream repository from the gerrit web interface. | 46 Land your changes to the upstream repository from the Gerrit web interface. |
| 47 | 47 |
| 48 If there are upstream changes, you may need to rebase your patches and reupload | 48 If there are upstream changes, you may need to rebase your patches and reupload |
| 49 them. | 49 them. |
| 50 | 50 |
| 51 ```shell | 51 ```shell |
| 52 git pull | 52 git pull |
| 53 git cl upload | 53 git cl upload |
| 54 ``` | 54 ``` |
| 55 | 55 |
| 56 # Rolling ANGLE into Chrome | 56 # Rolling ANGLE into Chrome |
| 57 | 57 |
| 58 To roll DEPS, make sure this is not commented out and update the hash associated | 58 To roll DEPS, make sure this is not commented out and update the hash associated |
| 59 with "angle\_revision". (Your hash will be different than the one below.) | 59 with "angle\_revision". (Your hash will be different than the one below.) |
| 60 | 60 |
| 61 ``` | 61 ``` |
| 62 "angle_revision": "0ee126c670edae8dd1822980047450a9a530c032", | 62 "angle_revision": "0ee126c670edae8dd1822980047450a9a530c032", |
| 63 ``` | 63 ``` |
| 64 | 64 |
| 65 Then sync. | 65 Then sync. |
| 66 | 66 |
| 67 ```shell | 67 ```shell |
| 68 gclient sync | 68 gclient sync |
| 69 ``` | 69 ``` |
| 70 | 70 |
| 71 Your changes should now be in third\_party/angle. | 71 Your changes should now be in third\_party/angle. |
| OLD | NEW |