Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: link to the apply-waydroid-patches script/func #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

docs: link to the apply-waydroid-patches script/func #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion development/compile-waydroid-lineage-os-based-images.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Then we setup the local build environment:

### Patching

After that is complete, we apply the Waydroid patches:
After that is complete, we apply the Waydroid patches [using the provided script](https://github.com/waydroid/android_vendor_waydroid/blob/b2fa4643f50488eefcfd415290bcfa445752e8c9/vendorsetup.sh#L4):

```text
apply-waydroid-patches
Expand Down
2 changes: 1 addition & 1 deletion development/manual-patch-resolution.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Manual Patch Resolution

At the end of the `apply-waydroid-patches` script, it will show the results of how each patch applied. You will want to then make a copy of all the results of the patch scripts \(Copy and paste the contents of the terminal output into a Notepad or text document\). Each of the patches applied either resulted in "Applying", "Already applied", or "Conflicts". The only ones we want to pay attention to here are the "Conflicts", but only half of them.
At the end of [the `apply-waydroid-patches` script](https://github.com/waydroid/android_vendor_waydroid/blob/b2fa4643f50488eefcfd415290bcfa445752e8c9/vendorsetup.sh#L4), it will show the results of how each patch applied. You will want to then make a copy of all the results of the patch scripts \(Copy and paste the contents of the terminal output into a Notepad or text document\). Each of the patches applied either resulted in "Applying", "Already applied", or "Conflicts". The only ones we want to pay attention to here are the "Conflicts", but only half of them.

Some of the patches have duplicates for different vendor setups. So you will sometimes get results that look like this:

Expand Down