Revisit how the Android port works. #20912

paulrouget · 2018-06-04T11:34:06Z

Fix #20855
Fix #18625
Fix #21147

Before polishing and making sure everything works fine (like the VR code, the android-x86 version, the non-android version of the lib, …), I'd like to get some early feedback on the approach.

I recommend reviewing commit by commit.

To test, just follow the regular steps:

    ./mach build -d --android
    ./mach package --dev --android builds servo.apk
    ./mach install --dev --android && ./mach run --android

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

There are tests for these changes OR
These changes do not require tests because _____

This change is

cbrewster · 2018-06-04T11:40:01Z

ports/libsimpleservo/README.md

@@ -0,0 +1,3 @@
+This is a basic wrapper around Servo. While libservo itself (/components/servo/) offers a lot of flexibility,
+libsimpleservo (/ports/libsimpleservo/) tries to make it easier to embed Servo, without much configuration needed.
+It is limited to only one view (no tabs, no multiple renering area).


s/renering area/rendering areas/

jdm

This looks like a really useful improvement :D

jdm · 2018-06-04T18:49:06Z

ports/libsimpleservo/build.rs

+use std::path::Path;
+
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");


Note that if the build script itself (or one of its dependencies) changes, then it's rebuilt and rerun unconditionally, so cargo:rerun-if-changed=build.rs is almost always redundant (unless you want to ignore changes in all other files except for build.rs).

From https://doc.rust-lang.org/cargo/reference/build-scripts.html

jdm · 2018-06-04T18:49:06Z

ports/libsimpleservo/src/api.rs

+
+struct ResourceReader(Box<ReadFileTrait>);
+unsafe impl Send for ResourceReader {}
+unsafe impl Sync for ResourceReader {}


This is scary. What if we store Box<ReadFileTrait + Send + Sync> instead?

paulrouget · 2018-06-19T05:23:58Z

Note to self:

~~make sure /ports/servo still works~~
~~test Android x86~~
~~missing support for Event::Suspended~~
~~test VR~~
~~test non-Android x86 (add example or port ports/servo to libsimpleservo (can be followup))~~
~~build ServoView and Surface code in a AAR file along the APK (for Crow and Klar) (can be followup)~~
~~remove android_injected_glue from all over and dependencies if possible~~ not necessary anymore

paulrouget · 2018-06-19T06:23:56Z

x86 build still works as long as EGL 3 is available.

paulrouget · 2018-06-19T08:18:23Z

WebVR build segfaults:

com.mozilla.servo A/libc: Fatal signal 11 (SIGSEGV), code 1, fault addr 0xc in tid 17599 (WebVRThread), pid 17357 (m.mozilla.servo)

paulrouget · 2018-06-19T09:09:38Z

@MortimerGoro I might need your help here.

I get a crash in self.service.get_displays() (components/webvr/webvr_thread.rs) which is a rust-webvr method. I'm building with --features googlevr. It works well on master, but with this current PR it segfaults.

This PR changes how Servo runs on Android. Instead of using an empty Android app and load Servo via Glutin, we have a proper Android app that use a GLSurfaceView and load servo as a library and make some calls via JNI. I don't know what get_displays does, do you have any hint of what could go wrong? When can get_displays crash?

In the meantime, I will compile with my own version of rust-webvr see if I can find precisely where it crashes.

@jdm / @MortimerGoro also, in general, do you know how to get a rust stack trace on Android when it crashes?

MortimerGoro · 2018-06-19T09:27:39Z

@paulrouget I suspect that the crash is related to JNI calls which get the activity this way: android::get_app().activity

Could you check that android::get_app() is not null && the activity has a correct value?. If not we'll need to implement a different way to get it or expose a method in rust-webvr to set it from servo.

MortimerGoro · 2018-06-19T09:29:13Z

@paulrouget have you checked if WebGL works ok? IIRC GLSurfaceView was not a very friendly API to create shared contexts

paulrouget · 2018-06-19T10:08:52Z

@MortimerGoro WebGL works.

paulrouget · 2018-06-19T10:25:21Z

You were right. I'll try to figure out how to fix this.

paulrouget · 2018-06-19T10:42:42Z

@MortimerGoro I don't use android rs glue. Should I? Does it even make sense for a library?

If I don't, what's the alternative? We could add some embedder methods to access the activity. Would that be enough?

MortimerGoro · 2018-06-19T11:04:06Z

I think that the best way would be to get rid of android-rs-glue, and pass the JNI JavaVM and Activity pointers to rust-webvr (e.g. in the constructor or initialization methods).

jdm · 2018-06-19T18:14:22Z

To answer the question about stack traces, I do the following:

copy the logcat output that includes the crash information and unresolved symbols to a temporary file log
run ndk-stack -sym target/armv7-linux-androideabi/debug/apk/jniLibs/armeabi-v7a/ -dump log
(it might be necessary to pass target/armv7-linux-androideabi/debug/apk/obj/local/armeabi-v7a/lib/ for the sym directory instead; I forget which is correct at the moment)

bors-servo · 2018-06-19T21:37:40Z

☔ The latest upstream changes (presumably #20421) made this pull request unmergeable. Please resolve the merge conflicts.

paulrouget · 2018-06-20T05:41:27Z

@MortimerGoro,

I think that the best way would be to get rid of android-rs-glue

Entirely? Looks like it's used extensively.

paulrouget · 2018-06-20T05:44:59Z

@MortimerGoro what if I initialize the android glue manually ~~(calling main2)~~ by setting ANDROID_APP manually?


        new android port: update fakeld


        new android port: fix android build and tests


        Update Gradle and SDK

paulrouget · 2018-07-31T15:37:32Z

@bors-servo r=jdm,mortimergoro,simonsapin

jdm · 2018-07-31T15:51:05Z

@bors-servo r=jdm,mortimergoro,simonsapin

bors-servo · 2018-07-31T15:51:10Z

📌 Commit a923e8b has been approved by jdm,mortimergoro,simonsapin

jdm · 2018-07-31T16:11:55Z

@bors-servo r=jdm,mortimergoro,simonsapin

bors-servo · 2018-07-31T16:11:56Z

📌 Commit 6a31864 has been approved by jdm,mortimergoro,simonsapin

bors-servo · 2018-07-31T17:07:35Z

⌛ Testing commit 6a31864 with merge 95b54ca...


        Auto merge of #20912 - paulrouget:androidv2, r=jdm,mortimergoro,simon…

…sapin Revisit how the Android port works. Fix #20855 Fix #18625 Fix #21147 Before polishing and making sure everything works fine (like the VR code, the android-x86 version, the non-android version of the lib, …), I'd like to get some early feedback on the approach. I recommend reviewing commit by commit. To test, just follow the regular steps: ``` ./mach build -d --android ./mach package --dev --android builds servo.apk ./mach install --dev --android && ./mach run --android ``` ---  - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20912)

bors-servo · 2018-07-31T18:35:10Z

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm,mortimergoro,simonsapin
Pushing 95b54ca to master...


        Auto merge of #21199 - paulrouget:aar, r=MortimerGoro

Publish a AAR with servoview Depends on #20912 Fix #21127 ---  - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable).  - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21199)

Darkspirit · 2019-11-10T17:10:26Z

This PR deleted occurrences of android_params.
Should apparently unused file /resources/android_params now be deleted, too?

paulrouget · 2019-11-11T09:54:48Z

This PR deleted occurrences of android_params.
Should apparently unused file /resources/android_params now be deleted, too?

Likely. Can you file a dedicated issue for that?

cbrewster reviewed Jun 4, 2018

View changes

jdm added the S-awaiting-review label Jun 4, 2018

jdm self-assigned this Jun 4, 2018

paulrouget mentioned this pull request Jun 4, 2018

Better Embedding API proposal #18479

Open

tigercosmos mentioned this pull request Jun 4, 2018

Android nightly APK download link? #20913

Closed

jdm added this to In progress in Android MVP Jun 4, 2018

jdm reviewed Jun 4, 2018

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Jun 4, 2018

paulrouget mentioned this pull request Jun 18, 2018

Crash when changing orientation of android build #20741

Closed

paulrouget force-pushed the paulrouget:androidv2 branch from 3f49ad8 to 5d49cb3 Jun 18, 2018

highfive added S-awaiting-review and removed S-needs-code-changes labels Jun 18, 2018

paulrouget force-pushed the paulrouget:androidv2 branch from 5d49cb3 to d66c219 Jun 19, 2018

jdm removed the S-awaiting-review label Jun 19, 2018

highfive added the S-needs-rebase label Jun 19, 2018

paulrouget added 3 commits Jul 2, 2018

new android port: update fakeld

76d394e

new android port: fix android build and tests

bef2fe8

Update Gradle and SDK

Loading status checks…

6a31864

paulrouget force-pushed the paulrouget:androidv2 branch from a923e8b to 6a31864 Jul 31, 2018

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Jul 31, 2018

Android MVP automation moved this from In progress to Done Jul 31, 2018

highfive removed the S-awaiting-merge label Jul 31, 2018

This was referenced Jul 31, 2018

Upgrade to SM 60 #21029

Merged

Implement Window.open and related infrastructure #20678

Merged

This was referenced Aug 1, 2018

[Android] Re-introduce pinch to zoom #21303

Closed

[Android] Honor prefs.json #21304

Open

[libsimpleservo port] Support OpenGL #21305

Open

Disable enable_subpixel_text_antialiasing for VR #21306

Closed

Can't pan in emulator builds #20742

Closed

jdm mentioned this pull request Aug 2, 2018

Custom features no longer affect the build #21314

Closed

SimonSapin mentioned this pull request Sep 7, 2018

println doesn't appear in logcat output #21637

Closed

servo / servo

Revisit how the Android port works. #20912

Revisit how the Android port works. #20912

paulrouget commented Jun 4, 2018 •

edited

This comment has been minimized.

jdm left a comment

This comment has been minimized.

This comment has been minimized.

paulrouget commented Jun 19, 2018 •

edited

paulrouget commented Jun 19, 2018

paulrouget commented Jun 19, 2018 •

edited

paulrouget commented Jun 19, 2018

MortimerGoro commented Jun 19, 2018 •

edited

MortimerGoro commented Jun 19, 2018 •

edited

paulrouget commented Jun 19, 2018

paulrouget commented Jun 19, 2018

paulrouget commented Jun 19, 2018

MortimerGoro commented Jun 19, 2018

jdm commented Jun 19, 2018

bors-servo commented Jun 19, 2018

paulrouget commented Jun 20, 2018

paulrouget commented Jun 20, 2018 •

edited

paulrouget commented Jul 31, 2018

jdm commented Jul 31, 2018

bors-servo commented Jul 31, 2018

jdm commented Jul 31, 2018

bors-servo commented Jul 31, 2018

bors-servo commented Jul 31, 2018

bors-servo commented Jul 31, 2018

Darkspirit commented Nov 10, 2019

paulrouget commented Nov 11, 2019

servo / servo

Join GitHub today

Revisit how the Android port works. #20912

Revisit how the Android port works. #20912

Conversation

paulrouget commented Jun 4, 2018 • edited

This comment has been minimized.

cbrewster Jun 4, 2018

jdm left a comment

This comment has been minimized.

jdm Jun 4, 2018

This comment has been minimized.

jdm Jun 4, 2018

paulrouget commented Jun 19, 2018 • edited

paulrouget commented Jun 19, 2018

paulrouget commented Jun 19, 2018 • edited

paulrouget commented Jun 19, 2018

MortimerGoro commented Jun 19, 2018 • edited

MortimerGoro commented Jun 19, 2018 • edited

paulrouget commented Jun 19, 2018

paulrouget commented Jun 19, 2018

paulrouget commented Jun 19, 2018

MortimerGoro commented Jun 19, 2018

jdm commented Jun 19, 2018

bors-servo commented Jun 19, 2018

paulrouget commented Jun 20, 2018

paulrouget commented Jun 20, 2018 • edited

paulrouget commented Jul 31, 2018

jdm commented Jul 31, 2018

bors-servo commented Jul 31, 2018

jdm commented Jul 31, 2018

bors-servo commented Jul 31, 2018

bors-servo commented Jul 31, 2018

bors-servo commented Jul 31, 2018

Darkspirit commented Nov 10, 2019

paulrouget commented Nov 11, 2019

paulrouget commented Jun 4, 2018 •

edited

paulrouget commented Jun 19, 2018 •

edited

paulrouget commented Jun 19, 2018 •

edited

MortimerGoro commented Jun 19, 2018 •

edited

MortimerGoro commented Jun 19, 2018 •

edited

paulrouget commented Jun 20, 2018 •

edited