diff options
| author | cions <gh.cions@gmail.com> | 2024-01-10 22:04:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-10 06:04:14 -0700 |
| commit | 881a62869db13199eff30231d4299d36faf143df (patch) | |
| tree | e739decaa38309910485c0808b25df9a1e560534 /cli | |
| parent | 1bafde9cd03f42f490cf0e6e504a5606ac6b634e (diff) | |
fix: android support (#19437)
<!--
Before submitting a PR, please read https://deno.com/manual/contributing
1. Give the PR a descriptive title.
Examples of good title:
- fix(std/http): Fix race condition in server
- docs(console): Update docstrings
- feat(doc): Handle nested reexports
Examples of bad title:
- fix #7123
- update docs
- fix bugs
2. Ensure there is a related issue and it is referenced in the PR text.
3. Ensure there are tests that cover the changes.
4. Ensure `cargo test` passes.
5. Ensure `./tools/format.js` passes without changing files.
6. Ensure `./tools/lint.js` passes.
7. Open as a draft PR if your work is still in progress. The CI won't
run
all steps, but you can add '[ci]' to a commit message to force it to.
8. If you would like to run the benchmarks on the CI, add the 'ci-bench'
label.
-->
---------
Signed-off-by: Matt Mastracci <matthew@mastracci.com>
Co-authored-by: Matt Mastracci <matthew@mastracci.com>
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" |
