mirror of
https://github.com/servo/servo.git
synced 2025-08-09 23:45:35 +01:00
Move android port code to servoshell (#32533)
Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com> Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
parent
6f64a5afad
commit
24906e1c21
17 changed files with 156 additions and 241 deletions
|
@ -2,9 +2,6 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// For Android, see /support/android/apk/ + /ports/jniapi/.
|
||||
#![cfg(not(target_os = "android"))]
|
||||
|
||||
#[cfg(any(target_os = "macos", target_os = "linux"))]
|
||||
#[macro_use]
|
||||
extern crate sig;
|
||||
|
@ -12,15 +9,19 @@ extern crate sig;
|
|||
#[cfg(test)]
|
||||
mod test;
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
mod backtrace;
|
||||
mod crash_handler;
|
||||
#[cfg(not(any(target_os = "android", target_env = "ohos")))]
|
||||
pub(crate) mod desktop;
|
||||
#[cfg(not(target_os = "android"))]
|
||||
mod panic_hook;
|
||||
mod parser;
|
||||
mod prefs;
|
||||
mod resources;
|
||||
|
||||
mod egl;
|
||||
|
||||
pub mod platform {
|
||||
#[cfg(target_os = "macos")]
|
||||
pub use crate::platform::macos::deinit;
|
||||
|
@ -41,7 +42,7 @@ pub fn main() {
|
|||
pub fn main() {
|
||||
println!(
|
||||
"Cannot start /ports/servoshell/ on Android. \
|
||||
Use /support/android/apk/ + /ports/jniapi/ instead"
|
||||
Use /support/android/apk/ + `libservoshell.so` instead"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue