commit | c30edd12c5b3554c7e7e5b144b1159dcae330603 | [log] [tgz] |
---|---|---|
author | Ethan Yonker <dees_troy@teamw.in> | Sat Nov 08 07:05:47 2014 -0600 |
committer | Ethan Yonker <dees_troy@teamw.in> | Sat Nov 08 07:05:47 2014 -0600 |
tree | 40a8ba215b17f42f8fbf6ac3d991a3107e14011e | |
parent | 24813426b9cf6d4a79e5da68008d1a4532e6c710 [diff] |
Fix potential tree conflicts with scrypt Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc
Team Win Recovery Project (TWRP)
The goal of this branch is to rebase TWRP onto AOSP while maintaining as much of the original AOSP code as possible. This goal should allow us to apply updates to the AOSP code going forward with little to no extra work. With this goal in mind, we will carefully consider any changes needed to the AOSP code before allowing them. In most cases, instead of changing the AOSP code, we'll create our own functions instead. The only changes that should be made to AOSP code should be those affecting startup of the recovery and some of the make files.
If there are changes that need to be merged from AOSP, we will pull the change directly from AOSP instead of creating a new patch in order to prevent merge conflicts with AOSP.
This branch is under final testing and will be used shortly for public builds, but has not officially been released.
You can find a compiling guide here.
More information about the project.
If you have code changes to submit those should be pushed to our gerrit instance. A guide can be found here.