From 41251bf67fdc1af4fbdda080f355a8ba978d8e17 Mon Sep 17 00:00:00 2001 From: NECMI Date: Wed, 4 Jun 2025 14:44:34 +0200 Subject: [PATCH 1/2] build: fix android build Fixes: https://github.com/nodejs/node/issues/58505 --- tools/v8_gypfiles/v8.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 3ea5564d5463a2..857ebb36dbe769 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -1465,7 +1465,7 @@ ], }, { 'sources': [ - '<(V8_ROOT)/src/base/debug/stack_trace_android.cc', + '<(V8_ROOT)/src/base/debug/stack_trace_posix.cc', '<(V8_ROOT)/src/base/platform/platform-linux.cc', ], }], From 63d8698628acec1f9374840c51ff872d4587860b Mon Sep 17 00:00:00 2001 From: necm1 Date: Wed, 4 Jun 2025 15:49:08 +0200 Subject: [PATCH 2/2] build: merge source files for android in v8.gyp Refs: https://github.com/nodejs/node/pull/58574#pullrequestreview-2896784826 --- tools/v8_gypfiles/v8.gyp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 857ebb36dbe769..f6aa84815fee52 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -1447,6 +1447,8 @@ '<(V8_ROOT)/src/base/platform/platform-posix.h', '<(V8_ROOT)/src/base/platform/platform-posix-time.cc', '<(V8_ROOT)/src/base/platform/platform-posix-time.h', + '<(V8_ROOT)/src/base/debug/stack_trace_posix.cc', + '<(V8_ROOT)/src/base/platform/platform-linux.cc', ], 'link_settings': { 'target_conditions': [ @@ -1457,19 +1459,6 @@ }], ], }, - 'target_conditions': [ - ['_toolset=="host"', { - 'sources': [ - '<(V8_ROOT)/src/base/debug/stack_trace_posix.cc', - '<(V8_ROOT)/src/base/platform/platform-linux.cc', - ], - }, { - 'sources': [ - '<(V8_ROOT)/src/base/debug/stack_trace_posix.cc', - '<(V8_ROOT)/src/base/platform/platform-linux.cc', - ], - }], - ], }], ['is_fuchsia', { 'sources': [