Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/android-emulator-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ jobs:
arch: x86_64
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
# Pinned to emulator 37.1.11: 37.2.12 gets the runner killed (shutdown
# signal) ~10 min into the full suite, on recipe as well as on upgrades.
emulator-build: 15917651
disable-animations: true
script: |
set -e
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,9 @@ jobs:
target: default
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
# Pinned to emulator 37.1.11: 37.2.12 gets the runner killed (shutdown
# signal) ~10 min into the full suite, on recipe as well as on upgrades.
emulator-build: 15917651
disable-animations: true
# NB: android-emulator-runner runs `script` line-by-line, so the
# invocation must be a single line (no backslash continuations).
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/full-device-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ jobs:
arch: x86_64
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
# Pinned to emulator 37.1.11: 37.2.12 gets the runner killed (shutdown
# signal) ~10 min into the full suite, on recipe as well as on upgrades.
emulator-build: 15917651
disable-animations: true
script: |
adb wait-for-device
Expand Down
2 changes: 1 addition & 1 deletion expected-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# run prepare.sh (or regenerate-patches.py, which prints the hash) and
# update the value below in the same commit. If you forget, CI fails and
# prints the hash it got.
408864fba897050cd2bf10e1a1ff3ad3ba838bf1
7348f35be43b704ac87fcb8971cb841f98a00312
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ index 5cea0393f4..dfec53e67e 100644
- os.system("./configure --dest-cpu=" + DEST_CPU + " --dest-os=android --openssl-no-asm --cross-compiling")
+ os.system("./configure --dest-cpu=" + DEST_CPU + " --dest-os=android --openssl-no-asm --with-intl=" + intl + extra_flags + " --cross-compiling --shared")
diff --git a/configure.py b/configure.py
index 7fd64a9620..40642c1af4 100755
index b826e24e3f..65e3255d10 100755
--- a/configure.py
+++ b/configure.py
@@ -1146,6 +1146,11 @@ parser.add_argument('-C',
@@ -1119,6 +1119,11 @@ parser.add_argument('-C',
default=None,
help=argparse.SUPPRESS)

Expand All @@ -152,7 +152,7 @@ index 7fd64a9620..40642c1af4 100755
parser.add_argument('--clang-cl',
action='store',
dest='clang_cl',
@@ -1655,6 +1660,9 @@ def configure_node_cctest_sources(o):
@@ -1628,6 +1633,9 @@ def configure_node_cctest_sources(o):
SearchFiles('test/cctest', 'h')

def configure_node(o):
Expand Down
18 changes: 9 additions & 9 deletions patches/build-mobile-platform-settings-in-common.gypi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Co-authored-by: João Matos <joao@tritao.eu>
1 file changed, 118 insertions(+), 7 deletions(-)

diff --git a/common.gypi b/common.gypi
index 83e0691d4a..dc33231a0d 100644
index bc690955d3..b3a74cb587 100644
--- a/common.gypi
+++ b/common.gypi
@@ -112,7 +112,7 @@
@@ -115,7 +115,7 @@
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
}],
Expand All @@ -35,7 +35,7 @@ index 83e0691d4a..dc33231a0d 100644
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
}],
@@ -223,6 +223,23 @@
@@ -226,6 +226,23 @@
}],
],
}],
Expand All @@ -59,7 +59,7 @@ index 83e0691d4a..dc33231a0d 100644
['OS=="solaris"', {
# pull in V8's postmortem metadata
'ldflags': [ '-Wl,-z,allextract' ]
@@ -231,7 +248,7 @@
@@ -234,7 +251,7 @@
# increase performance, number from experimentation
'cflags': [ '-qINLINE=::150:100000' ]
}],
Expand All @@ -68,7 +68,7 @@ index 83e0691d4a..dc33231a0d 100644
# -fno-omit-frame-pointer is necessary for the --perf_basic_prof
# flag to work correctly. perf(1) gets confused about JS stack
# frames otherwise, even with --call-graph dwarf.
@@ -450,7 +467,7 @@
@@ -453,7 +470,7 @@
[ 'target_arch=="arm64"', {
'msvs_configuration_platform': 'arm64',
}],
Expand All @@ -77,7 +77,7 @@ index 83e0691d4a..dc33231a0d 100644
'cflags+': [
'-fno-omit-frame-pointer',
'-fsanitize=address',
@@ -478,7 +495,7 @@
@@ -481,7 +498,7 @@
}],
],
}],
Expand All @@ -86,7 +86,7 @@ index 83e0691d4a..dc33231a0d 100644
'cflags+': [
'-fno-omit-frame-pointer',
'-fsanitize=undefined',
@@ -487,7 +504,7 @@
@@ -490,7 +507,7 @@
'cflags!': [ '-fno-omit-frame-pointer' ],
'ldflags': [ '-fsanitize=undefined' ],
}],
Expand All @@ -95,7 +95,7 @@ index 83e0691d4a..dc33231a0d 100644
'xcode_settings': {
'OTHER_CFLAGS+': [
'-fno-omit-frame-pointer',
@@ -595,11 +612,13 @@
@@ -601,11 +618,13 @@
}],
['_toolset=="host"', {
'conditions': [
Expand All @@ -111,7 +111,7 @@ index 83e0691d4a..dc33231a0d 100644
'cflags': [ '-m64' ],
'ldflags': [ '-m64' ],
}],
@@ -759,6 +778,98 @@
@@ -773,6 +792,98 @@
}],
],
}],
Expand Down
8 changes: 4 additions & 4 deletions patches/build-mobile-targets-in-node.gyp-node.gypi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Co-authored-by: Julia Samól <j.samol@papers.ch>
2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/node.gyp b/node.gyp
index c58f4812e2..d8b6eb51f5 100644
index 62c748b130..b6f06f9d44 100644
--- a/node.gyp
+++ b/node.gyp
@@ -68,6 +68,11 @@
Expand All @@ -36,7 +36,7 @@ index c58f4812e2..d8b6eb51f5 100644
'<@(node_builtin_shareable_builtins)',
],
'node_sources': [
@@ -923,7 +928,8 @@
@@ -925,7 +930,8 @@
'<@(node_quic_sources)',
],
}],
Expand All @@ -46,7 +46,7 @@ index c58f4812e2..d8b6eb51f5 100644
'target_arch=="x64" and '
'node_target_type=="executable"', {
'defines': [ 'NODE_ENABLE_LARGE_CODE_PAGES=1' ],
@@ -1405,8 +1411,9 @@
@@ -1422,8 +1428,9 @@
['OS=="solaris"', {
'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
}],
Expand All @@ -58,7 +58,7 @@ index c58f4812e2..d8b6eb51f5 100644
'type': 'none',
}],
[ 'node_shared=="true"', {
@@ -1627,7 +1634,8 @@
@@ -1581,7 +1588,8 @@
[ 'node_shared_libuv=="false"', {
'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ],
}],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ index e614c39a6b..711428f898 100644
'configurations': {
'Debug': {
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index f90a29d102..b814fee544 100644
index 370001847e..3f1d3ee860 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -868,6 +868,15 @@
Expand Down
Loading
Loading