diff options
author | andybons <andybons@chromium.org> | 2015-08-24 14:37:09 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-24 21:39:36 +0000 |
commit | 3322f7611ba1444e553b2cce4de3a1a32ad46e72 (patch) | |
tree | dfb6bbea413da0581b8d085b184a5e6ceea5af3e /docs/angle_in_chromium.md | |
parent | 5d58c9eb2baa203be1b84ac88cde82c59d72f143 (diff) | |
download | chromium_src-3322f7611ba1444e553b2cce4de3a1a32ad46e72.zip chromium_src-3322f7611ba1444e553b2cce4de3a1a32ad46e72.tar.gz chromium_src-3322f7611ba1444e553b2cce4de3a1a32ad46e72.tar.bz2 |
Per https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/irLAQ8f8uGk
Initial migration of wiki content over to src/docs
There will be a follow-up CL to ensure docs are following chromium’s style guide, links are fixed, etc. The file auditing was becoming too much for a single change and per Nico’s suggestion, it seems to be better to do
+ Bulk import with initial prune.
+ Follow-up CLs to clean up the documentation.
So that each CL has its own purpose.
BUG=none
Review URL: https://codereview.chromium.org/1309473002
Cr-Commit-Position: refs/heads/master@{#345186}
Diffstat (limited to 'docs/angle_in_chromium.md')
-rw-r--r-- | docs/angle_in_chromium.md | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/docs/angle_in_chromium.md b/docs/angle_in_chromium.md new file mode 100644 index 0000000..a955ff0 --- /dev/null +++ b/docs/angle_in_chromium.md @@ -0,0 +1,71 @@ +# Hacking on ANGLE in Chromium + +In DEPS, comment out the part that looks like this. + +``` +# "src/third_party/angle": +# Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"), +``` + +Delete or rename third\_party/angle. + +(Optional) sync and make sure the third\_party/angle directory doesn't come +back. It shouldn’t because it is no longer referenced from DEPS. + +```shell +gclient sync -r CURRENT_REVISION +``` + +Clone the ANGLE git repository. + +``` +> git clone https://chromium.googlesource.com/angle/angle third_party/angle +> gclient runhooks +``` + +To check ANGLE builds (assumes you ran hooks with GYP\_GENERATORS=ninja) without +building all of Chromium. + +```shell +ninja -C out\Release libEGL.dll +``` + +Change files then commit locally. + +Upload to gerrit for review. You will need to have installed the git hook as +described in the "Getting started with Gerrit for ANGLE" section of the +ContributingCode doc before committing them locally. + +```shell +git cl upload +``` + +As with subversion and rietveld: visit the upload link for the review site, +check the diff and the commit message then add reviewer(s) and publish. + +Land your changes to the upstream repository from the gerrit web interface. + +If there are upstream changes, you may need to rebase your patches and reupload +them. + +```shell +git pull +git cl upload +``` + +# Rolling ANGLE into Chrome + +To roll DEPS, make sure this is not commented out and update the hash associated +with "angle\_revision". (Your hash will be different than the one below.) + +``` + "angle_revision": "0ee126c670edae8dd1822980047450a9a530c032", +``` + +Then sync. + +```shell +gclient sync +``` + +Your changes should now be in third\_party/angle. |