Skip to content

android: Determine default config dir and lower minSdk #46142

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.

Sign up for GitHub

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

Merged
yezhizhen merged 1 commit into from
Jul 1, 2026
+40 −2
Merged

android: Determine default config dir and lower minSdk #46142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion ports/servoshell/egl/android/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use std::cell::RefCell;
use std::os::raw::{c_char, c_int, c_void};
use std::path::PathBuf;
use std::ptr::NonNull;
use std::rc::Rc;
use std::sync::{Arc, OnceLock};
Expand Down Expand Up @@ -97,7 +98,7 @@ pub extern "C" fn Java_org_servo_servoview_JNIServo_version<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_init<'local>(
mut env: EnvUnowned<'local>,
_: JClass<'local>,
_activity: JObject<'local>,
activity: JObject<'local>,
opts: JObject<'local>,
callbacks_obj: JObject<'local>,
surface: JObject<'local>,
Expand Down Expand Up @@ -162,6 +163,10 @@ pub extern "C" fn Java_org_servo_servoview_JNIServo_init<'local>(

crate::init_crypto();

if let Err(error) = set_default_config_dir(env, &activity) {
error!("Failed to determine Android config directory: {error:?}");
}

let (opts, mut preferences, servoshell_preferences) =
match parse_command_line_arguments(init_opts.args.as_slice()) {
ArgumentParsingResult::ContentProcess(..) => {
Expand Down Expand Up @@ -910,6 +915,39 @@ fn get_field_as_string<'local>(
JString::cast_local(env, string_value)?.try_to_string(env)
}

fn set_default_config_dir<'local>(
env: &mut Env<'local>,
activity: &JObject<'local>,
) -> Result<(), Error> {
let files_dir = env
.call_method(
activity,
jni_str!("getFilesDir"),
jni_sig!("()Ljava/io/File;"),
&[],
)?
.l()?;
let path = env
.call_method(
&files_dir,
jni_str!("getAbsolutePath"),
jni_sig!("()Ljava/lang/String;"),
&[],
)?
.l()?;
let path = JString::cast_local(env, path)?.try_to_string(env)?;

let config_dir = PathBuf::from(path).join("servo");
if let Err(error) = std::fs::create_dir_all(&config_dir) {
error!("Failed to create config directory at {config_dir:?}: {error:?}");
}
debug!("Default config dir: {config_dir:?}");
let _ = crate::prefs::DEFAULT_CONFIG_DIR
.set(config_dir)
.inspect_err(|path| warn!("Default config dir was already set to {path:?}"));
Ok(())
}

fn get_options<'local>(
env: &mut Env<'local>,
opts: &JObject<'local>,
Expand Down
2 changes: 1 addition & 1 deletion support/android/apk/servoapp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {

defaultConfig {
applicationId = "org.servo.servoshell"
minSdk = 33
minSdk = 30
targetSdk = 34
versionCode = generatedVersionCode
versionName = "0.3.0"
Expand Down
Loading