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.

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

Move simpleservo_jni into servoshell #32533

Merged
merged 1 commit into from
Jun 19, 2024

Conversation

jschwe
Copy link
Contributor

@jschwe jschwe commented Jun 17, 2024

Move the native code of the android app into servoshell.
This change mainly just moves code, adapts the build script to use --crate-type=cdylib and the name servoshell on android too.
This PR does not attempt to improve codesharing between the android port and the previous servoshell - that is left to future commits.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #___ (GitHub issue number if applicable)

@jschwe
Copy link
Contributor Author

jschwe commented Jun 17, 2024

Follow-up to: #32532

@jschwe jschwe changed the title Draft: Move simpleservo_jni into servoshell Move simpleservo_jni into servoshell Jun 18, 2024
@jschwe jschwe marked this pull request as ready for review June 18, 2024 05:06
@jschwe
Copy link
Contributor Author

jschwe commented Jun 18, 2024

@mukilan Could you add the try android label?

@jschwe jschwe force-pushed the jschwender/servoshell_android branch 2 times, most recently from 2f1aaae to 5fa9c92 Compare June 18, 2024 05:18
@mukilan mukilan added the T-android Do a try run on Android label Jun 18, 2024
@github-actions github-actions bot removed the T-android Do a try run on Android label Jun 18, 2024
Copy link

🔨 Triggering try run (#9559452801) for Android

Copy link

✨ Try run (#9559452801) succeeded.

@jschwe
Copy link
Contributor Author

jschwe commented Jun 18, 2024

Rebased and fixed the conflict

@mrobinson mrobinson added this pull request to the merge queue Jun 18, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 18, 2024
@jschwe jschwe force-pushed the jschwender/servoshell_android branch from 70cdd17 to 8803842 Compare June 18, 2024 19:11
Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
@jschwe jschwe force-pushed the jschwender/servoshell_android branch from 8803842 to 3a31b56 Compare June 18, 2024 19:25
@mukilan mukilan added this pull request to the merge queue Jun 19, 2024
Merged via the queue into servo:main with commit 24906e1 Jun 19, 2024
10 checks passed
@jschwe jschwe deleted the jschwender/servoshell_android branch June 19, 2024 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants