1 <html devsite><head> 2 <title></title> 3 <meta name="project_path" value="/_project.yaml"/> 4 <meta name="book_path" value="/_book.yaml"/> 5 </head> 6 <body> 7 <!-- 8 Copyright 2017 The Android Open Source Project 9 10 Licensed under the Apache License, Version 2.0 (the "License"); 11 you may not use this file except in compliance with the License. 12 You may obtain a copy of the License at 13 14 http://www.apache.org/licenses/LICENSE-2.0 15 16 Unless required by applicable law or agreed to in writing, software 17 distributed under the License is distributed on an "AS IS" BASIS, 18 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 19 See the License for the specific language governing permissions and 20 limitations under the License. 21 --> 22 23 <p> AOSP <a href="https://android-review.googlesource.com/">Gerrit</a> </p> 24 <h3 id="prerequisites"></h3> 25 <ul> 26 <li> 27 <p><a href="/source/initializing.html"></a><a href="/source/downloading.html"></a><a href="https://android.googlesource.com/new-password"></a></p> 28 </li> 29 <li> 30 <p> Repo Git<a href="/source/developing.html"></a></p> 31 </li> 32 <li> 33 <p> Android <a href="/source/roles.html"></a></p> 34 </li> 35 <li> 36 <p> Android <a href="/source/licenses.html">AOSP </a></p> 37 </li> 38 <li> 39 <p> Android <a href="#upstream-projects"></a></p> 40 </li> 41 </ul> 42 <h2 id="for-contributors"></h2> 43 <h3 id="authenticate-with-the-server"></h3> 44 <p><a href="https://android.googlesource.com/new-password"></a> Gerrit <a href="/source/downloading.html#using-authentication"></a></p> 45 <h3 id="start-a-repo-branch"> Repo </h3> 46 <p> Git </p> 47 <pre><code>$ repo start NAME . 48 </code></pre> 49 <p>NAME Gerrit </p> 50 <h3 id="make-your-change"></h3> 51 <p></p> 52 <pre><code>$ git add -A 53 $ git commit -s 54 </code></pre> 55 <p> AOSP </p> 56 <ul> 57 58 <li> 59 <p> 50 Git Gerrit </p> 60 </li> 61 62 <li> 63 <p> 72 </p> 64 </li> 65 <li> 66 <p></p> 67 </li> 68 </ul> 69 70 <p></p> 71 <pre><code>short description on first line 72 73 more detailed description of your patch, 74 which is likely to take up multiple lines. 75 </code></pre> 76 77 <p><code>repo 78 init</code> ID </p> 79 <h3 id="upload-to-gerrit"> Gerrit</h3> 80 <p> Gerrit</p> 81 <pre><code>$ repo upload 82 </code></pre> 83 <p></p> 84 <p>Repo <a href="https://android-review.googlesource.com/">Gerrit</a> </p> 85 <h3 id="uploading-a-replacement-patch"></h3> 86 <p> Git Gerrit ID</p> 87 <p><em> Git HEAD</em></p> 88 <pre><code>$ git add -A 89 $ git commit --amend 90 </code></pre> 91 <p> Gerrit Git </p> 92 <h3 id="resolving-sync-conflicts"></h3> 93 <p> HEAD (rebase) </p> 94 <pre><code>$ repo sync 95 </code></pre> 96 <p> HEAD HEAD </p> 97 <p></p> 98 <pre><code>$ repo rebase 99 </code></pre> 100 <p> <code>git mergetool</code> </p> 101 <pre><code>$ git rebase --continue 102 </code></pre> 103 <p> <code>repo 104 upload</code> </p> 105 <h3 id="after-a-submission-is-approved"></h3> 106 <p>Gerrit <code>repo sync</code> </p> 107 <h2 id="for-reviewers-and-verifiers"></h2> 108 <h3 id="reviewing-a-change"></h3> 109 <p></p> 110 <ul> 111 <li> 112 <p></p> 113 </li> 114 <li> 115 <p></p> 116 </li> 117 <li> 118 <p></p> 119 </li> 120 <li> 121 <p></p> 122 </li> 123 <li> 124 <p></p> 125 </li> 126 <li> 127 <p></p> 128 </li> 129 </ul> 130 <p> Gerrit LGTM</p> 131 <h3 id="verifying-a-change"></h3> 132 <p></p> 133 <ul> 134 <li> 135 <p></p> 136 </li> 137 <li> 138 <p></p> 139 </li> 140 <li> 141 <p> Gerrit Publish CommentsVerifiedFails</p> 142 </li> 143 </ul> 144 <h3 id="downloading-changes-from-gerrit"> Gerrit </h3> 145 <p> <code>repo sync</code> </p> 146 <pre><code>$ repo download TARGET CHANGE 147 </code></pre> 148 <p> TARGET CHANGE <a href="https://android-review.googlesource.com/">Gerrit</a> <a href="/source/using-repo.html">Repo </a></p> 149 <h3 id="how-do-i-become-a-verifier-or-approver"></h3> 150 <p> Android Android <a href="/source/roles.html"></a></p> 151 <h3 id="diffs-and-comments"></h3> 152 <p> Gerrit ID Side-by-side diffs</p> 153 <h3 id="adding-comments"></h3> 154 <p> Gerrit Gerrit </p> 155 <p>Save</p> 156 <p> Gerrit Publish Comments</p> 157 <p><a name="upstream-projects"></a></p> 158 <h2 id="upstream-projects"></h2> 159 <p>Android <a href="/source/code-lines.html"></a> Linux WebKit <code>external/</code> Android Android </p> 160 <p> Bionic BSD Bionic BSD BSD</p> 161 <h3 id="icu4c">ICU4C</h3> 162 <p> <code>external/icu4c</code> ICU4C <a href="http://site.icu-project.org/">icu-project.org/</a> <a href="http://site.icu-project.org/bugs"> ICU </a></p> 163 164 <h3 id="llvmclangcompiler-rt">LLVM/Clang/Compiler-rt</h3> 165 <p> LLVM <code>external/clang</code><code>external/compiler-rt</code><code>external/llvm</code> <a href="http://llvm.org/">llvm.org/</a> </p> 166 167 <h3 id="mksh">mksh</h3> 168 <p> <code>external/mksh</code> MirBSD Korn Shell miros-mksh (a] mirbsd.org <a href="https://launchpad.net/mksh">Launchpad</a> 169 </p> 170 <h3 id="openssl">OpenSSL</h3> 171 <p> <code>external/openssl</code> OpenSSL <a href="http://www.openssl.org">openssl.org</a> </p> 172 <h3 id="v8">V8</h3> 173 <p> <code>external/v8</code> V8 <a href="https://code.google.com/p/v8">code.google.com/p/v8</a> <a href="https://code.google.com/p/v8/wiki/Contributing"> V8 </a></p> 174 <h3 id="webkit">WebKit</h3> 175 <p> <code>external/webkit</code> WebKit <a href="http://www.webkit.org">webkit.org</a> WebKit Android <code>Platform</code> <code>OS</code> <code>Android</code><a href="http://webkit.org/coding/contributing.html"> WebKit </a></p> 176 <h3 id="zlib">zlib</h3> 177 <p> <code>external/zlib</code> zlib <a href="http://zlib.net">zlib.net</a> </p> 178 179 </body></html>