Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: describe the fix for compiling android node.js on an x86_64 host #54995

Closed
wants to merge 111 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
2143a37
test_runner: support typescript module mocking
marco-ippolito Sep 19, 2024
9368376
meta: remove never-used workflow trigger
RedYetiDev Sep 19, 2024
ff110e2
doc: mark v21 as End-of-Life
RedYetiDev Sep 19, 2024
9f2cb01
deps: update V8 to 12.9.202.18
targos Sep 17, 2024
829fb77
build: reset embedder string to "-node.0"
targos Sep 17, 2024
87a3e5d
src: update NODE_MODULE_VERSION to 131
targos Aug 24, 2024
f0b3ed1
deps: always define V8_EXPORT_PRIVATE as no-op
targos Sep 21, 2022
1c91248
deps: disable V8 concurrent sparkplug compilation
targos Apr 6, 2023
960609c
deps: patch V8 to avoid duplicated zlib symbol
targos Sep 16, 2023
0d9febe
deps: patch V8 to support compilation with MSVC
StefanStojanovic Apr 21, 2024
003deaa
deps: fix FP16 bitcasts.h
StefanStojanovic May 28, 2024
45279bd
deps: always define V8_NODISCARD as no-op
targos Aug 8, 2024
5cc32fc
deps: patch V8 to support older Clang versions
targos Aug 27, 2024
3921657
deps: V8: cherry-pick 01a47f3ffff2
targos Aug 26, 2024
dc51416
deps: V8: cherry-pick 97199f686e2f
targos Sep 5, 2024
9462e76
tools: add additonal include dirs for V8 on AIX
abmusse Sep 9, 2024
04efd98
test: refactor test-whatwg-webstreams-encoding to be shorter
hidaviddong Sep 19, 2024
80ad758
tools: refactor js2c.cc to use c++20
anonrig Sep 19, 2024
1577450
benchmark: include ascii to fs/readfile
RafaelGSS Sep 19, 2024
b79f88c
build,win: float VS 17.11 compilation patch
StefanStojanovic Sep 19, 2024
4999178
doc: reflect toolchains used for official binaries
richardlau Sep 20, 2024
dab77b0
test: remove test-http-max-sockets flaky designation
lpinca Sep 20, 2024
ad6e9c3
test: move test-http-max-sockets to parallel
lpinca Sep 20, 2024
0ee11e2
test: fix invalid wasm test
RedYetiDev Sep 20, 2024
8a54bcf
doc: add more details for localStorage and sessionStorage
Rekl0w Sep 20, 2024
4918c06
test_runner: add support for coverage via run()
atlowChemi Sep 20, 2024
0a7a9c4
test: add runner watch mode isolation tests
pmarchini Sep 20, 2024
82d9a04
src: add unistd.h import if node posix credentials is defined
JonasBa Sep 20, 2024
216a224
tls: fix 'ERR_TLS_PSK_SET_IDENTIY_HINT_FAILED' typo
RedYetiDev Sep 20, 2024
2cb250a
module: write compile cache to temporary file and then rename it
joyeecheung Sep 4, 2024
ce0e128
module: throw when invalid argument is passed to enableCompileCache()
joyeecheung Sep 17, 2024
4af5c6d
module: implement flushCompileCache()
joyeecheung Sep 4, 2024
35c4391
src: cleanup per env handles directly without a list
legendecas Sep 20, 2024
d33a2e3
build: fix eslint makefile target
RedYetiDev Sep 20, 2024
b30aafe
test: add asserts to validate test assumptions
mhdawson Sep 18, 2024
18f549b
test: fix `soucre` to `source`
RedYetiDev Sep 21, 2024
4fc67f9
cli: remove deprecated V8 flag
omerktz Sep 19, 2024
8f6303d
test_runner: replace ansi clear with ansi reset
pmarchini Sep 21, 2024
0abd602
tools: update error message for ICU in license-builder
RedYetiDev Sep 3, 2024
55975c2
build: add the option to generate compile_commands.json in vcbuild.bat
segevfiner Mar 30, 2024
1ead283
test: deflake test-http-header-overflow
lpinca Sep 17, 2024
9d71871
lib: propagate aborted state to dependent signals before firing events
jazelly Sep 8, 2024
442de14
events: allow null/undefined eventInitDict
KhafraDev Aug 29, 2024
12bec38
test: remove unused common utilities
RedYetiDev Sep 7, 2024
fd16258
fs: convert to u8 string for filesystem path
jazelly Sep 20, 2024
f6db198
test: remove `getCallSite` from common
RedYetiDev Sep 14, 2024
42ffa23
build: support up to python 3.13 in android-configure
RedYetiDev Aug 23, 2024
e0dd169
test: improve coverage for timer promises schedular
RedYetiDev Jun 6, 2024
f81e4e9
zlib: throw brotli initialization error from c++
anonrig Sep 1, 2024
599d508
util: update ansi regex
RedYetiDev Sep 9, 2024
69af8e1
test: add `util.stripVTControlCharacters` test
RedYetiDev Sep 9, 2024
57de03f
src: mark node --run as stable
anonrig Sep 20, 2024
dc9e370
test_runner: use `test:` symbol on second print of parent test
RedYetiDev Sep 15, 2024
aa72bcb
src: revert filesystem::path changes
anonrig Sep 21, 2024
83d0e5e
test_runner: add 'test:summary' event
cjihrig Sep 21, 2024
30e94da
test: adjust tls-set-ciphers for OpenSSL32
mhdawson Sep 21, 2024
c8e955a
doc: cover --experimental-test-module-mocks flag
textbook Sep 21, 2024
795aa4b
doc: add missing EventSource docs to globals
KhafraDev Sep 22, 2024
55597ab
meta: add `linux` to OS labels in collaborator guide
RedYetiDev Sep 22, 2024
a0bf2bc
module: remove duplicated import
RedYetiDev Sep 22, 2024
874c49c
test: fix `test-vm-context-dont-contextify` when path contains a space
aduh95 Sep 22, 2024
037a623
test: do not assume `process.execPath` contains no spaces
aduh95 Sep 22, 2024
8a98678
test,crypto: update WebCryptoAPI WPT
panva Sep 22, 2024
fadd57d
test: update tls test to support OpenSSL32
mhdawson Sep 22, 2024
1544524
doc: remove `parseREPLKeyword` from REPL documentation
RedYetiDev Sep 22, 2024
6402c30
test: make `test-runner-assert` more robust
RedYetiDev Sep 22, 2024
61a52d9
test_runner: report error on missing sourcemap source
RedYetiDev Sep 23, 2024
8f0c9a2
build: display free disk space after build in the test-macOS workflow
iwuliz Sep 20, 2024
c3a02fd
build: remove -v flag to reduce noise
iwuliz Sep 20, 2024
02aed15
src: move evp stuff to ncrypto
jasnell Sep 12, 2024
92e0bcd
benchmark: add webstorage benchmark
jakecastelli Sep 23, 2024
c1d160a
crypto: ensure invalid SubtleCrypto JWK data import results in DataError
panva Sep 23, 2024
23fab65
process: remove `process.assert`
RedYetiDev Sep 23, 2024
ecf7c4d
lib: remove lib/internal/idna.js
anonrig Sep 23, 2024
85a6fe8
doc: add note about `--expose-internals`
RedYetiDev Sep 23, 2024
a796309
tools: remove redudant code from eslint require rule
RedYetiDev Sep 23, 2024
b7b84d1
string_decoder: refactor encoding validation
anonrig Sep 23, 2024
7e4d740
test: deflake test-inspector-strip-types
lpinca Sep 24, 2024
bcd65df
deps: update acorn-walk to 8.3.4
nodejs-github-bot Sep 24, 2024
9e40cdd
test: remove interval and give more time to unsync
pmarchini Sep 24, 2024
cee75ab
build: update ruff and add `lint-py-fix`
RedYetiDev Sep 24, 2024
0e36877
doc: add abmusse to collaborators
abmusse Sep 23, 2024
6b37e25
perf_hooks: add missing type argument to getEntriesByName
luketaher Sep 24, 2024
381806c
lib: prefer optional chaining
RedYetiDev Sep 24, 2024
51e1c41
tty: fix links for terminal colors
RedYetiDev Sep 24, 2024
508bd6c
build: add more information to Makefile help
RedYetiDev Sep 24, 2024
f768282
tools: unlock versions of irrelevant DB deps
targos Sep 24, 2024
0f67ce8
stream: set stream prototype to closest transferable superclass
jazelly Sep 24, 2024
92e7377
src: do not call path.back() when it is empty
zcbenz Sep 25, 2024
09dee04
module: implement the "module-sync" exports condition
joyeecheung Sep 25, 2024
20a0dd5
repl: catch `\v` and `\r` in new-line detection
RedYetiDev Sep 25, 2024
b736176
lib, tools: remove duplicate requires
RedYetiDev Sep 25, 2024
442c368
Revert "test: mark test-fs-watch-non-recursive flaky on Windows"
lpinca Sep 25, 2024
4fcef58
doc: correct `cleanup` option in stream.(promises.)finished
Renegade334 Sep 25, 2024
f9a6ed3
lib: fix typos
NathanBaulch Sep 25, 2024
f815910
src: update clang-tidy and focus on modernization
anonrig Sep 25, 2024
0ba7627
benchmark: create benchmark for typescript
marco-ippolito Sep 25, 2024
3998ece
test: fix some tests when path contains `%`
aduh95 Sep 25, 2024
1a4516c
test_runner: fix mocking modules with quote in their URL
aduh95 Sep 25, 2024
920f4fe
meta: add more information about nightly releases
RedYetiDev Sep 25, 2024
047a70c
test: fix `assertSnapshot` when path contains a quote
aduh95 Sep 25, 2024
0167f1a
deps: patch V8 to 12.9.202.19
nodejs-github-bot Sep 22, 2024
9c506f8
test: fix more tests that fail when path contains a space
aduh95 Sep 25, 2024
fd70d34
test: fix test-tls-junk-closes-server
mhdawson Sep 25, 2024
7488e58
src: decode native error messages as UTF-8
joyeecheung Sep 25, 2024
95fc231
crypto: runtime deprecate crypto.fips
anonrig Sep 25, 2024
2a8fb5b
test: deflake test-http-remove-header-stays-removed
lpinca Sep 26, 2024
02ac8ec
buffer: extract Blob's .arrayBuffer() & webidl changes
KhafraDev Sep 26, 2024
c03803a
buffer: make File cloneable
KhafraDev Sep 26, 2024
264d3ee
build: hardcode the `gcc` and `g++` paths on android when compiling o…
haotaoyanzhuce Sep 18, 2024
ae76c63
Merge branch 'nodejs:main' into main
haotaoyanzhuce Sep 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions android_configure.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import platform
import sys
import os
import shutil

# TODO: In next version, it will be a JSON file listing all the patches, and then it will iterate through to apply them.
def patch_android():
Expand Down Expand Up @@ -61,6 +62,9 @@ def patch_android():
elif platform.system() == "Linux":
host_os = "linux"
toolchain_path = android_ndk_path + "/toolchains/llvm/prebuilt/linux-x86_64"
if platform.machine() in {"x86_64", "x86"}:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this exclusively for linux?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This modification is made for Linux x86

os.environ['CC_host'] = shutil.which('gcc').strip()
os.environ['CCX_host'] = shutil.which('g++').strip()

os.environ['PATH'] += os.pathsep + toolchain_path + "/bin"
os.environ['CC'] = toolchain_path + "/bin/" + TOOLCHAIN_PREFIX + android_sdk_version + "-" + "clang"
Expand Down
3 changes: 3 additions & 0 deletions lib/internal/modules/esm/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ function initializeDefaultConditions() {
...userConditions,
]);
defaultConditionsSet = new SafeSet(defaultConditions);
if (getOptionValue('--experimental-require-module')) {
defaultConditionsSet.add('module-sync');
}
}

/**
Expand Down