diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-10 21:38:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-10 21:38:15 +0000 |
commit | a04a8467860277bf569bf6df5acb426a985381a7 (patch) | |
tree | 1bf81519a6a5d4ea4c5344c5f7365773183e0461 | |
parent | 0ca418161da5d38bb226f0003fe16c5c604f5a44 (diff) | |
parent | d7ffb4bea9abac0dcc598481d2a0e6ded63ee98a (diff) | |
download | guava-a04a8467860277bf569bf6df5acb426a985381a7.tar.gz |
Merge "Add instructions for updating external/guava"
-rw-r--r-- | Android.bp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 2fdd93ca6..376abe982 100644 --- a/Android.bp +++ b/Android.bp @@ -49,6 +49,24 @@ license { ], } +// Instructions for updating the guava version +// +// Guava updates must be merged to AOSP first. Make sure you are not using a +// shallow copy of the Android tree to run the following instructions: +// +// 1. File a bug to generate a branch with the version you want to update to. +// You can use b/209469232 as starting point. This step will generate an +// upstream branch. +// 2. Create your work branch using `repo start <your_branch_name>`. +// 3. Fetch the upstream branch using `git fetch aosp <upstream_branch_name>`. +// 4. Run the merge using `git merge FETCH_HEAD`. +// 5. Update the METADATA file in this directory to reflect your changes. +// +// Note: When running `repo upload` to generate the CL, repo will produce a +// warning about the number of commits you are trying to upload. This is +// expected, and you can accept safely (a single gerrit "merge commit" change +// will be created). + java_library { name: "guava", host_supported: true, |