Preliminary Android build support #31086

mukilan · 2024-01-15T09:10:41Z

The built APK still doesn't run on device and it crashes on loading.
This is happening only after the rust compiler toolchain update. I
am still investigating this, but it is proving to be challenging as
the generated stack trace doesn't show function names even
in debug build and after ensuring Gradle doesn't strip the symbols.

The goal with this PR is to land the changes with just the CI build
passing.

Other issues that need to be resolved in future PRs

Enable GStreamer support - this is disabled for now
Enable bluetooth support - blurdroid is unmaintained and doesn't
compile now.
Revisit issues involving dependencies - jemalloc-sys, freetype and
fontconfig
Revisit compositing logic & event handling. Apps can lose underlying
GL Surface when they are sent to background. I have added logic to
pause/resume the compositor when this happens so that we bind/unbind.
Scrolling is also now 'janky' after the move from WebRender based zoom
to Servo handling the zoom with root pipeline.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes do not require tests because these changes are for preliminary support. CI sanity check of android is disabled for now as apk crashes and sanity test code is also incorrect.

* Fixes * More fixes - Still failing in the linking step * More work on getting linking working Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

more android build fixes.

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

NDK requires we compile against the minSdk API level which is 30 in our case. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

This commit drops: * support for google, oculusvr * support for arm5 architecture and also removes * fakeld scripts * unused java code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

mrobinson

Great work! I'm so glad to see this happening. I have a bunch of comments below, but this is already looking very nice.

ports/libsimpleservo/jniapi/build.rs

ports/libsimpleservo/jniapi/src/lib.rs

python/servo/build_commands.py

python/servo/command_base.py

components/compositing/compositor.rs

ports/libsimpleservo/jniapi/Cargo.toml

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

libservo and android_logger can use env_logger 0.10 but quickcheck is still stuck on 0.8 and has not seen any activity in the last 2 years. This commit adds a duplicate exception until the quickcheck dependency can be upgraded (or replaced) Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

mrobinson

Nice! So happy to see this finally landing. Just a couple small things before landing and also let's go ahead and disable jemalloc for Android.

.github/workflows/android.yml

components/compositing/compositor.rs

components/compositing/windowing.rs

mrobinson · 2024-01-22T08:05:45Z

components/servo/lib.rs

@@ -1091,6 +1098,9 @@ fn default_user_agent_string_for(agent: UserAgent) -> &'static str {
    const DESKTOP_UA_STRING: &'static str =
        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Servo/1.0 Firefox/111.0";

+    #[cfg(target_os = "android")]


It might be a good moment to clean this up and just conditionally define a UA_STRING and always return it.

Hmm, the existing code is written so that the user can switch user agent to ios/android specific ones even on desktop at runtime using this flag, probably to allow testing.

I think implementing what you suggested would require removing this functionality from libservo (maybe we can do it to ports/servoshell). Can this be tackled in a separate PR?

ports/libsimpleservo/jniapi/build.rs

python/servo/command_base.py

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

mukilan · 2024-01-22T13:00:11Z

Thanks for the review!

* Android build * Fixes * More fixes - Still failing in the linking step * More work on getting linking working Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: use mozjs with ndk r25c. loads servo.org more android build fixes. * fix ./mach run for android and make it follow logs Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * add experimental logic for compositor pause/resume Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * pass DPI from android to simpleservo Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * ci: add android workflow Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * switch to ANDROID_SDK_ROOT and ANDROID_NDK_ROOT vars Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade gradle to 4.10.1 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade to gradle 5.1.1 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade to gradle 8 and agp 8 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * make compositing work again with external present Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: improve mach support for non-NixOS and CI Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fix sampler compilation bug introduced in servo#30490 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * ci: add android build to main workflow Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * gradle: set MinSdk = targetSdk = 30 NDK requires we compile against the minSdk API level which is 30 in our case. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * add instructions for android in README.md Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: move servosurface to servoview Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: uncomment the mediasession callbacks on MainActivity Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: fix crash on MainAtivity.onDestroy Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: drop VR, arm 5 and unused code This commit drops: * support for google, oculusvr * support for arm5 architecture and also removes * fakeld scripts * unused java code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * cleanup shell.nix Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: add FIXMEs for gstreamer code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * apk: remove commented code and debug logs Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * cleanup ServoView.java Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * mach: comment call to download gstreamer deps for android Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * disable bluetooth for jniapi as blurdroid is broken Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fixup! README.md * fixup! remove change in Cargo.toml * fixup! move shell variables together * fixup! cleanup jniapi/Cargo.toml comments * delete commented gstreamer related android code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * remove unused config variable in servbuild Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: more cleanup Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * force no_static_freetype only for android * use actions to manage sdk, ndk and java Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * rename embedder event names to be more clear. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * link to startup crash issue Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fix lint issues Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * upgrade env_logger to 0.10 with duplicate exception libservo and android_logger can use env_logger 0.10 but quickcheck is still stuck on 0.8 and has not seen any activity in the last 2 years. This commit adds a duplicate exception until the quickcheck dependency can be upgraded (or replaced) Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * android: fix comments Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * disable jemalloc on android Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> * fixup! replace linux with android in cfg --------- Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>

mrobinson and others added 29 commits January 12, 2024 18:48

Android build

e7999e1

* Fixes * More fixes - Still failing in the linking step * More work on getting linking working Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

android: use mozjs with ndk r25c. loads servo.org

30edb7b

more android build fixes.

fix ./mach run for android and make it follow logs

fab55cd

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

add experimental logic for compositor pause/resume

19df5f0

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

pass DPI from android to simpleservo

fba3251

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

ci: add android workflow

b32fdb5

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

switch to ANDROID_SDK_ROOT and ANDROID_NDK_ROOT vars

0a3388d

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

upgrade gradle to 4.10.1

7dfb843

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

upgrade to gradle 5.1.1

1cfd7ed

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

upgrade to gradle 8 and agp 8

1f8fa9d

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

make compositing work again with external present

e25c25d

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

android: improve mach support for non-NixOS and CI

48d6e21

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

fix sampler compilation bug introduced in servo#30490

1b62306

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

ci: add android build to main workflow

4722da1

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

gradle: set MinSdk = targetSdk = 30

66ff983

NDK requires we compile against the minSdk API level which is 30 in our case. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

add instructions for android in README.md

c9bb850

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

apk: move servosurface to servoview

c56c032

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

apk: uncomment the mediasession callbacks on MainActivity

74b074b

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

apk: fix crash on MainAtivity.onDestroy

2d53254

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

apk: drop VR, arm 5 and unused code

1731e24

This commit drops: * support for google, oculusvr * support for arm5 architecture and also removes * fakeld scripts * unused java code Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

cleanup shell.nix

06838bc

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

android: add FIXMEs for gstreamer code

125e8ce

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

apk: remove commented code and debug logs

3d78ea1

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

cleanup ServoView.java

95ab3fd

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

mach: comment call to download gstreamer deps for android

6636cd4

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

disable bluetooth for jniapi as blurdroid is broken

d361a65

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

fixup! README.md

88cb326

fixup! remove change in Cargo.toml

23bd092

fixup! move shell variables together

247fe39

mrobinson requested changes Jan 15, 2024

View reviewed changes

mukilan added 10 commits January 15, 2024 17:01

fixup! cleanup jniapi/Cargo.toml comments

d913747

delete commented gstreamer related android code

dbf9ec2

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

remove unused config variable in servbuild

5c0f667

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

android: more cleanup

0139fc0

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

force no_static_freetype only for android

bcdadea

use actions to manage sdk, ndk and java

e8f808f

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

rename embedder event names to be more clear.

9bc0a56

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

link to startup crash issue

a61571f

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

fix lint issues

7be376a

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

mukilan requested a review from mrobinson January 22, 2024 04:51

mrobinson approved these changes Jan 22, 2024

View reviewed changes

mukilan added 3 commits January 22, 2024 14:05

android: fix comments

a4fc43c

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

disable jemalloc on android

5395c3e

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

fixup! replace linux with android in cfg

260af55

mukilan added this pull request to the merge queue Jan 22, 2024

Merged via the queue into servo:main with commit d7de206 Jan 22, 2024
11 checks passed

mukilan deleted the android-ng branch January 22, 2024 14:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Preliminary Android build support #31086

Preliminary Android build support #31086

mukilan commented Jan 15, 2024

mrobinson left a comment

mrobinson left a comment

mrobinson Jan 22, 2024

mukilan Jan 22, 2024

mrobinson Jan 22, 2024

mukilan commented Jan 22, 2024

Preliminary Android build support #31086

Preliminary Android build support #31086

Conversation

mukilan commented Jan 15, 2024

mrobinson left a comment

Choose a reason for hiding this comment

mrobinson left a comment

Choose a reason for hiding this comment

mrobinson Jan 22, 2024

Choose a reason for hiding this comment

mukilan Jan 22, 2024

Choose a reason for hiding this comment

mrobinson Jan 22, 2024

Choose a reason for hiding this comment

mukilan commented Jan 22, 2024