Skip to content

Commit fe76236

Browse files
committed
Set HOST_ARCH separately
1 parent dfaf6cc commit fe76236

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/build-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ jobs:
176176
OS: android
177177
ARCH: arm64
178178
ANDROID_NDK_VERSION: r28
179+
HOST_ARCH: x64
179180
runs-on: ubuntu-22.04
180181
steps:
181182
- name: Set up JDK 17

build-tools/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
22
# Based on https://github.com/denoland/rusty_v8/blob/main/BUILD.gn
33

4-
if (target_os == "android") {
5-
import("//build/config/android/config.gni")
6-
}
4+
# if (target_os == "android") {
5+
# import("//build/config/android/config.gni")
6+
# }
77

88
static_library("c_v8") {
99
complete_static_lib = true

build-tools/build_v8.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if [ "${OS}" = "ios" ]; then
3636
EXTRA_ARGS="v8_enable_pointer_compression=false v8_enable_webassembly=false target_environment=\"${TARGET_ENVIRONMENT}\""
3737
fi
3838
if [ "${OS}" = "android" ]; then
39-
EXTRA_ARGS="v8_enable_pointer_compression=false v8_enable_webassembly=false is_component_build=false v8_target_cpu=\"${ARCH}\" use_custom_libcxx=false android_ndk_root=\"${ANDROID_NDK_ROOT}\" android_ndk_version=\"${ANDROID_NDK_VERSION}\" android_ndk_major_version=26"
39+
EXTRA_ARGS="v8_enable_pointer_compression=false v8_enable_webassembly=false is_component_build=false v8_target_cpu=\"${ARCH}\" use_custom_libcxx=false android_ndk_root=\"${ANDROID_NDK_ROOT}\" android_ndk_version=\"${ANDROID_NDK_VERSION}\" android_ndk_major_version=28"
4040
fi
4141

4242
TARGET_ARCH=${ARCH}
@@ -52,7 +52,7 @@ tools/gn \
5252
--args="
5353
target_os=\"${OS}\"
5454
target_cpu=\"${TARGET_ARCH}\"
55-
host_cpu=\"${TARGET_ARCH}\"
55+
host_cpu=\"${HOST_ARCH}\"
5656
is_debug=${IS_DEBUG}
5757
symbol_level=${SYMBOL_LEVEL}
5858
is_official_build=false ${EXTRA_ARGS}

0 commit comments

Comments
 (0)