ohos/android: Fix some compiler warnings (#34178)

* ohos: Remove unnecessary library links

`ohos-sys` now correctly links all required libraries, so we
don't need to specify them here again.
We still specify `ace_napi.z`, since we use napi via `napi-ohos`, which currently does not add the required link.

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>

* Disable some unused functions on ohos/android

- get_default_url()
- parse_url_or_filename()
- add_noto_fallback_families

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>

* ohos: Remove unneeded import

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>

---------

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
This commit is contained in:
Jonathan Schwender 2024-11-07 20:53:57 +01:00 committed by GitHub
parent 219d3c9cd5
commit 4f6283d7fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 10 deletions

View file

@ -34,12 +34,8 @@ use super::servo_glue::ServoGlue;
mod resources;
mod simpleservo;
// Todo: in the future these libraries should be added by Rust sys-crates
// Can be removed once <https://github.com/ohos-rs/ohos-rs/pull/105> is merged / released.
#[link(name = "ace_napi.z")]
#[link(name = "ace_ndk.z")]
#[link(name = "hilog_ndk.z")]
#[link(name = "native_window")]
#[link(name = "clang_rt.builtins", kind = "static")]
extern "C" {}
#[napi(object)]

View file

@ -10,6 +10,7 @@ use servo::servo_config::pref;
use servo::servo_url::ServoUrl;
use url::{self, Url};
#[cfg(not(any(target_os = "android", target_env = "ohos")))]
pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<ServoUrl, ()> {
match ServoUrl::parse(input) {
Ok(url) => Ok(url),
@ -20,6 +21,7 @@ pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<ServoUrl, ()> {
}
}
#[cfg(not(any(target_os = "android", target_env = "ohos")))]
pub fn get_default_url(
url_opt: Option<&str>,
cwd: impl AsRef<Path>,