fix(android): remove ffi

denoland · Sep 24, 2024 · c32cb3c · c32cb3c
1 parent 5c54dc5
commit c32cb3c
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 36 deletions.
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -49,7 +49,6 @@ deno_core.workspace = true
 deno_cron.workspace = true
 deno_crypto.workspace = true
 deno_fetch.workspace = true
-deno_ffi.workspace = true
 deno_fs = { workspace = true, features = ["sync_fs"] }
 deno_http.workspace = true
 deno_io.workspace = true
@@ -80,7 +79,6 @@ deno_core.workspace = true
 deno_cron.workspace = true
 deno_crypto.workspace = true
 deno_fetch.workspace = true
-deno_ffi.workspace = true
 deno_fs = { workspace = true, features = ["sync_fs"] }
 deno_http.workspace = true
 deno_io.workspace = true

diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js
@@ -10,7 +10,6 @@ import {
 import * as timers from "ext:deno_web/02_timers.js";
 import * as httpClient from "ext:deno_fetch/22_http_client.js";
 import * as console from "ext:deno_console/01_console.js";
-import * as ffi from "ext:deno_ffi/00_ffi.js";
 import * as net from "ext:deno_net/01_net.js";
 import * as tls from "ext:deno_net/02_tls.js";
 import * as serve from "ext:deno_http/00_serve.ts";
@@ -252,7 +251,6 @@ const denoNs = {
 const unstableIds = {
   broadcastChannel: 1,
   cron: 2,
-  ffi: 3,
   fs: 4,
   http: 5,
   kv: 6,
@@ -272,14 +270,6 @@ denoNsUnstableById[unstableIds.cron] = {
   cron: cron.cron,
 };
 
-denoNsUnstableById[unstableIds.ffi] = {
-  dlopen: ffi.dlopen,
-  UnsafeCallback: ffi.UnsafeCallback,
-  UnsafePointer: ffi.UnsafePointer,
-  UnsafePointerView: ffi.UnsafePointerView,
-  UnsafeFnPointer: ffi.UnsafeFnPointer,
-};
-
 denoNsUnstableById[unstableIds.fs] = {
   flock: fs.flock,
   flockSync: fs.flockSync,
@@ -325,11 +315,6 @@ const denoNsUnstable = {
   umask: fs.umask,
   HttpClient: httpClient.HttpClient,
   createHttpClient: httpClient.createHttpClient,
-  dlopen: ffi.dlopen,
-  UnsafeCallback: ffi.UnsafeCallback,
-  UnsafePointer: ffi.UnsafePointer,
-  UnsafePointerView: ffi.UnsafePointerView,
-  UnsafeFnPointer: ffi.UnsafeFnPointer,
   UnsafeWindowSurface: webgpuSurface.UnsafeWindowSurface,
   flock: fs.flock,
   flockSync: fs.flockSync,

diff --git a/runtime/lib.rs b/runtime/lib.rs
@@ -8,7 +8,6 @@ pub use deno_core;
 pub use deno_cron;
 pub use deno_crypto;
 pub use deno_fetch;
-pub use deno_ffi;
 pub use deno_fs;
 pub use deno_http;
 pub use deno_io;
@@ -65,11 +64,6 @@ pub static UNSTABLE_GRANULAR_FLAGS: &[(
     "Enable unstable Deno.cron API",
     2,
   ),
-  (
-    deno_ffi::UNSTABLE_FEATURE_NAME,
-    "Enable unstable FFI APIs",
-    3,
-  ),
   (
     deno_fs::UNSTABLE_FEATURE_NAME,
     "Enable unstable file system APIs",

diff --git a/runtime/shared.rs b/runtime/shared.rs
@@ -26,7 +26,6 @@ extension!(runtime,
     deno_crypto,
     deno_broadcast_channel,
     deno_node,
-    deno_ffi,
     deno_net,
     deno_napi,
     deno_http,

diff --git a/runtime/snapshot.rs b/runtime/snapshot.rs
@@ -54,15 +54,6 @@ impl deno_fetch::FetchPermissions for Permissions {
   }
 }
 
-impl deno_ffi::FfiPermissions for Permissions {
-  fn check_partial(
-    &mut self,
-    _path: Option<&Path>,
-  ) -> Result<(), deno_core::error::AnyError> {
-    unreachable!("snapshotting!")
-  }
-}
-
 impl deno_napi::NapiPermissions for Permissions {
   fn check(
     &mut self,
@@ -241,7 +232,6 @@ pub fn create_runtime_snapshot(
     deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm(
       deno_broadcast_channel::InMemoryBroadcastChannel::default(),
     ),
-    deno_ffi::deno_ffi::init_ops_and_esm::<Permissions>(),
     deno_net::deno_net::init_ops_and_esm::<Permissions>(None, None),
     deno_tls::deno_tls::init_ops_and_esm(),
     deno_kv::deno_kv::init_ops_and_esm(deno_kv::sqlite::SqliteDbHandler::<

diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
@@ -460,7 +460,6 @@ impl WebWorker {
       deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm(
         options.broadcast_channel.clone(),
       ),
-      deno_ffi::deno_ffi::init_ops_and_esm::<PermissionsContainer>(),
       deno_net::deno_net::init_ops_and_esm::<PermissionsContainer>(
         options.root_cert_store_provider.clone(),
         options.unsafely_ignore_certificate_errors.clone(),

diff --git a/runtime/worker.rs b/runtime/worker.rs
@@ -384,7 +384,6 @@ impl MainWorker {
       deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm(
         options.broadcast_channel.clone(),
       ),
-      deno_ffi::deno_ffi::init_ops_and_esm::<PermissionsContainer>(),
       deno_net::deno_net::init_ops_and_esm::<PermissionsContainer>(
         options.root_cert_store_provider.clone(),
         options.unsafely_ignore_certificate_errors.clone(),