diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/build.rs | 23 | ||||
| -rw-r--r-- | cli/tests/integration/lsp_tests.rs | 2 | ||||
| -rw-r--r-- | cli/tsc/dts/lib.deno.ns.d.ts | 1 |
3 files changed, 18 insertions, 8 deletions
diff --git a/cli/build.rs b/cli/build.rs index f7efa8be7..d3f428c50 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -374,13 +374,16 @@ fn main() { panic!("Cross compiling with snapshot is not supported."); } - let symbols_path = std::path::Path::new("napi").join( - format!("generated_symbol_exports_list_{}.def", env::consts::OS).as_str(), - ) - .canonicalize() - .expect( - "Missing symbols list! Generate using tools/napi/generate_symbols_lists.js", - ); + let symbols_file_name = match env::consts::OS { + "android" => "generated_symbol_exports_list_linux.def".to_string(), + os => format!("generated_symbol_exports_list_{}.def", os), + }; + let symbols_path = std::path::Path::new("napi") + .join(symbols_file_name) + .canonicalize() + .expect( + "Missing symbols list! Generate using tools/napi/generate_symbols_lists.js", + ); #[cfg(target_os = "windows")] println!( @@ -413,6 +416,12 @@ fn main() { } } + #[cfg(target_os = "android")] + println!( + "cargo:rustc-link-arg-bin=deno=-Wl,--export-dynamic-symbol-list={}", + symbols_path.display() + ); + // To debug snapshot issues uncomment: // op_fetch_asset::trace_serializer(); diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs index 3053b2e64..c287df5cd 100644 --- a/cli/tests/integration/lsp_tests.rs +++ b/cli/tests/integration/lsp_tests.rs @@ -5933,7 +5933,7 @@ fn lsp_completions() { json!({ "label": "build", "kind": 6, - "detail": "const Deno.build: {\n target: string;\n arch: \"x86_64\" | \"aarch64\";\n os: \"darwin\" | \"linux\" | \"windows\" | \"freebsd\" | \"netbsd\" | \"aix\" | \"solaris\" | \"illumos\";\n vendor: string;\n env?: string | undefined;\n}", + "detail": "const Deno.build: {\n target: string;\n arch: \"x86_64\" | \"aarch64\";\n os: \"darwin\" | \"linux\" | \"android\" | \"windows\" | \"freebsd\" | \"netbsd\" | \"aix\" | \"solaris\" | \"illumos\";\n vendor: string;\n env?: string | undefined;\n}", "documentation": { "kind": "markdown", "value": "Information related to the build of the current Deno runtime.\n\nUsers are discouraged from code branching based on this information, as\nassumptions about what is available in what build environment might change\nover time. Developers should specifically sniff out the features they\nintend to use.\n\nThe intended use for the information is for logging and debugging purposes.\n\n*@category* - Runtime Environment" diff --git a/cli/tsc/dts/lib.deno.ns.d.ts b/cli/tsc/dts/lib.deno.ns.d.ts index 6d0b9e624..9740668b3 100644 --- a/cli/tsc/dts/lib.deno.ns.d.ts +++ b/cli/tsc/dts/lib.deno.ns.d.ts @@ -4958,6 +4958,7 @@ declare namespace Deno { os: | "darwin" | "linux" + | "android" | "windows" | "freebsd" | "netbsd" |