Preliminary Android build support (#31086)

* 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 #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>
2025-09-30 00:29:14 +01:00 · 2024-01-22 18:30:15 +05:30 · 2024-01-22 18:30:15 +05:30 · d7de206dbd
commit d7de206dbd
parent 8e6bdb69b1
58 changed files with 923 additions and 1382 deletions
--- a/support/android/apk/servoapp/build.gradle
+++ b/support/android/apk/servoapp/build.gradle
@ -1,18 +1,22 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}

 import java.util.regex.Matcher
 import java.util.regex.Pattern

 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdk 33
+    buildToolsVersion "33.0.2"
+
+    namespace 'org.mozilla.servo'

    buildDir = rootDir.absolutePath + "/../../../target/android/gradle/servoapp"

    defaultConfig {
        applicationId "org.mozilla.servo"
-        minSdkVersion 21
-        targetSdkVersion 27
+        minSdk 30
+        targetSdk 30
        versionCode 1
        versionName "1.0.0"
    }
@ -26,11 +30,7 @@ android {
    flavorDimensions "default"

    productFlavors {
-        main {
-        }
-        googlevr {
-        }
-        oculusvr {
+        basic {
        }
    }

@ -61,19 +61,6 @@ android {
        }

        // Custom build types
-        armDebug {
-            initWith(debug)
-            ndk {
-                abiFilters getNDKAbi('arm')
-            }
-        }
-
-        armRelease {
-            initWith(release)
-            ndk {
-                abiFilters getNDKAbi('arm')
-            }
-        }
        armv7Debug {
            initWith(debug)
            ndk {
@ -144,7 +131,6 @@ android {
 }

 dependencies {
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
    if (findProject(':servoview-local')) {
      implementation project(':servoview-local')
    } else {
--- a/support/android/apk/servoapp/src/googlevr/AndroidManifest.xml
+++ b/support/android/apk/servoapp/src/googlevr/AndroidManifest.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- BEGIN_INCLUDE(manifest) -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
-        package="org.mozilla.servo">
-    <application android:label="Servo">
-        <activity android:name=".MainActivity"
-                  android:label="Servo">
-            <meta-data android:name="android.app.lib_name" android:value="servo" />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.google.intent.category.LAUNCHER"/>
-                <category android:name="com.google.intent.category.DAYDREAM"/>
-                <category android:name="com.google.intent.category.CARDBOARD"/>
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
-<!-- END_INCLUDE(manifest) -->
--- a/support/android/apk/servoapp/src/main/AndroidManifest.xml
+++ b/support/android/apk/servoapp/src/main/AndroidManifest.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- BEGIN_INCLUDE(manifest) -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
-        package="org.mozilla.servo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">

    <uses-feature android:glEsVersion="0x00030000" android:required="true" />
    <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
--- a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
@ -78,8 +78,7 @@ public class MainActivity extends Activity implements Servo.Client {
        Intent intent = getIntent();
        String args = intent.getStringExtra("servoargs");
        String log = intent.getStringExtra("servolog");
-        String gstdebug = intent.getStringExtra("gstdebug");
-        mServoView.setServoArgs(args, log, gstdebug);
+        mServoView.setServoArgs(args, log);

        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
          mServoView.loadUri(intent.getData());
@ -89,8 +88,10 @@ public class MainActivity extends Activity implements Servo.Client {

    @Override
    protected void onDestroy() {
-      super.onDestroy();
-      mMediaSession.hideMediaSessionControls();
+        super.onDestroy();
+        if (mMediaSession != null) {
+            mMediaSession.hideMediaSessionControls();
+        }
    }

    private void setupUrlField() {
@ -229,31 +230,31 @@ public class MainActivity extends Activity implements Servo.Client {

    @Override
    public void onMediaSessionMetadata(String title, String artist, String album) {
-      if (mMediaSession == null) {
-        mMediaSession = new MediaSession(mServoView, this, getApplicationContext());
-      }
-      Log.d("onMediaSessionMetadata", title + " " + artist + " " + album);
-      mMediaSession.updateMetadata(title, artist, album);
+        if (mMediaSession == null) {
+            mMediaSession = new MediaSession(mServoView, this, getApplicationContext());
+        }
+        Log.d("onMediaSessionMetadata", title + " " + artist + " " + album);
+        mMediaSession.updateMetadata(title, artist, album);
    }

    @Override
    public void onMediaSessionPlaybackStateChange(int state) {
-      Log.d("onMediaSessionPlaybackStateChange", String.valueOf(state));
-      if (mMediaSession == null) {
-        mMediaSession = new MediaSession(mServoView, this, getApplicationContext());
-      }
+        Log.d("onMediaSessionPlaybackStateChange", String.valueOf(state));
+        if (mMediaSession == null) {
+            mMediaSession = new MediaSession(mServoView, this, getApplicationContext());
+        }

-      mMediaSession.setPlaybackState(state);
+        mMediaSession.setPlaybackState(state);

-      if (state == MediaSession.PLAYBACK_STATE_NONE) {
-          mMediaSession.hideMediaSessionControls();
-          return;
-      }
-      if (state == MediaSession.PLAYBACK_STATE_PLAYING ||
-          state == MediaSession.PLAYBACK_STATE_PAUSED) {
-          mMediaSession.showMediaSessionControls();
-          return;
-      }
+        if (state == MediaSession.PLAYBACK_STATE_NONE) {
+            mMediaSession.hideMediaSessionControls();
+            return;
+        }
+        if (state == MediaSession.PLAYBACK_STATE_PLAYING ||
+                state == MediaSession.PLAYBACK_STATE_PAUSED) {
+            mMediaSession.showMediaSessionControls();
+            return;
+        }
    }

    @Override
--- a/support/android/apk/servoapp/src/main/res/layout/activity_main.xml
+++ b/support/android/apk/servoapp/src/main/res/layout/activity_main.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
@ -102,4 +102,4 @@
            android:focusable="true"/>

    </LinearLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>