Add android CI and fix android (servo#331)

* Add android testing to CI

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Make EGL ctx current

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Update `test_newly_created_contexts_are_current`

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Android/OHOS does not support OpenGL compatibility profile

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

Author: sagudev

.github/workflows/main.yml

@@ -10,13 +10,12 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: full
 
 jobs:
   Build:
     name: ${{ format('{0} {1}', matrix.platform.target, matrix.features)}}
     runs-on: ${{ matrix.platform.os }}
-    env:
-      RUST_BACKTRACE: 1
     strategy:
       fail-fast: false
       matrix:
@@ -58,12 +57,11 @@ jobs:
           sudo apt install gcc libxxf86vm-dev libosmesa6-dev libgles2-mesa-dev xvfb weston -y
       - name: Install rust
         id: toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@1.81.0
         with:
           targets: ${{ matrix.platform.target }}
       - name: Build
         run: |
-          rustup target add ${{ matrix.platform.target }}
           cargo build --features "${{ matrix.features }}" --target ${{ matrix.platform.target }}
       - name: Test
         if: ${{ matrix.platform.test && startsWith(matrix.platform.os, 'ubuntu') }}
@@ -74,6 +72,51 @@ jobs:
         if: ${{ matrix.platform.test && !startsWith(matrix.platform.os, 'ubuntu') }}
         run: |
           cargo test --features "${{ matrix.features }}" --target ${{ matrix.platform.target }}
+
+  android-test:
+    name: ${{ format('x86_64-linux-android {0}', matrix.features)}}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        features:
+          [
+            "",
+            "chains sm-raw-window-handle-06",
+            "chains sm-raw-window-handle-05",
+          ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install rust
+        id: toolchain
+        uses: dtolnay/rust-toolchain@1.81.0
+        with:
+          targets: x86_64-linux-android
+
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-dinghy
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Run tests in android emulator
+        uses: reactivecircus/android-emulator-runner@v2
+        env:
+          RANLIB: "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
+        with:
+          api-level: 30
+          arch: x86_64
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            cargo dinghy all-platforms
+            cargo dinghy all-devices
+            cargo dinghy -p auto-android-x86_64-api30 --env RUST_BACKTRACE=${{ env.RUST_BACKTRACE }} test --features "${{ matrix.features }}" -- --test-threads 1
+
   Format:
     name: Run `rustfmt`
     runs-on: ubuntu-24.04
@@ -84,7 +127,7 @@ jobs:
   build_result:
     name: Result
     runs-on: ubuntu-24.04
-    needs: ["Build", "Format"]
+    needs: ["Build", "android-test", "Format"]
     if: always()
     steps:
       - name: Mark the job as successful

Cargo.toml

@@ -39,15 +39,19 @@ libc = "0.2"
 log = "0.4"
 glow = "0.16"
 osmesa-sys = { version = "0.1", optional = true }
-rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = ["std"], optional = true }
-rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = ["std"], optional = true }
+rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
+    "std",
+], optional = true }
+rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = [
+    "std",
+], optional = true }
 
 [dev-dependencies]
 clap = "2"
 gl = "0.14"
 png = "0.17"
 rand = "0.8"
-winit = "0.29"
+winit = { version = "0.29.10", features = ["android-native-activity"] }
 serial_test = "3.1.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]

examples/threads.rs

@@ -111,6 +111,9 @@ fn make_native_widget(
     native_widget
 }
 
+#[cfg(target_os = "android")]
+fn main() {}
+
 #[cfg(not(target_os = "android"))]
 fn main() {
     use winit::{

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.80.1"
-components = [ "rustfmt" ]
+channel = "1.81.0"
+components = ["rustfmt"]
 profile = "minimal"

src/platform/egl/context.rs

@@ -107,6 +107,14 @@ impl Device {
             // Create a dummy pbuffer.
             let pbuffer = context::create_dummy_pbuffer(egl_display, egl_context);
 
+            EGL_FUNCTIONS.with(|egl| {
+                if egl.MakeCurrent(egl_display, pbuffer, pbuffer, egl_context) == egl::FALSE {
+                    let err = egl.GetError().to_windowing_api_error();
+                    return Err(Error::MakeCurrentFailed(err));
+                }
+                Ok(())
+            })?;
+
             // Wrap up the EGL context.
             let context = Context {
                 egl_context,

src/platform/egl/mod.rs

@@ -18,3 +18,7 @@ crate::implement_interfaces!();
 #[cfg(feature = "sm-test")]
 #[path = "../../tests.rs"]
 pub mod tests;
+
+#[cfg(all(not(feature = "sm-test"), test))]
+#[path = "../../tests.rs"]
+pub mod tests;

src/platform/generic/egl/context.rs

@@ -295,6 +295,11 @@ impl ContextDescriptor {
             return Err(Error::UnsupportedGLProfile);
         }
 
+        // Android/OHOS does not support OpenGL compatibility profile at all
+        if cfg!(any(android_platform, ohos_platform)) && compatibility_profile {
+            return Err(Error::UnsupportedGLProfile);
+        }
+
         // Create required config attributes.
         //
         // We check these separately because `eglChooseConfig` on its own might give us 32-bit

src/tests.rs

@@ -204,14 +204,7 @@ pub fn test_newly_created_contexts_are_current() {
         unsafe { Gl::from_loader_function(|symbol| device.get_proc_address(&context, symbol)) };
 
     unsafe {
-        // Check to make sure GL calls don't work, because there is no surface.
-        clear(&gl, &[255, 0, 0, 255]);
-        assert_eq!(gl.get_error(), glow::INVALID_FRAMEBUFFER_OPERATION);
-        assert_ne!(get_pixel_from_bottom_row(&gl), [255, 0, 0, 255]);
-        assert_eq!(gl.get_error(), glow::INVALID_FRAMEBUFFER_OPERATION);
-        assert_eq!(gl.get_error(), glow::NO_ERROR);
-
-        // Make a context current.
+        // Make a context current with surface.
         let surface = make_surface(&mut device, &context);
         device
             .bind_surface_to_context(&mut context, surface)