build jit-nointl without external-startup-data

Kudo · Jan 25, 2024 · 3d7176c · 3d7176c
1 parent 95ef5ec
commit 3d7176c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -14,6 +14,10 @@ jobs:
     strategy:
       matrix:
         variant: [intl, nointl, jit-intl, jit-nointl]
+        external-startup-data: [true]
+        include:
+          - variant: jit-nointl
+            external-startup-data: false
 
     container:
       image: kudo/ubuntu-nonroot:20.04
@@ -22,6 +26,7 @@ jobs:
         TZ: UTC
         NO_INTL: ${{ contains(matrix.variant, 'nointl') }}
         NO_JIT: ${{ !contains(matrix.variant, 'jit') }}
+        EXTERNAL_STARTUP_DATA: ${{ matrix.external-startup-data }}
         DEPOT_TOOLS_UPDATE: 0
 
     steps:

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -113,11 +113,11 @@ function buildArch()
 
   local output_dir=''
   if [[ ${PLATFORM} = "ios" ]]; then
-    echo "Build v8 ${ios_env} ${arch} variant NO_INTL=${NO_INTL}"
+    echo "Build v8 ${ios_env} ${arch} variant NO_INTL=${NO_INTL} EXTERNAL_STARTUP_DATA=${EXTERNAL_STARTUP_DATA}"
     output_dir="out.v8.ios.${ios_env}.${arch}"
     gn gen --args="${GN_ARGS_BASE} ${GN_ARGS_BUILD_TYPE} target_cpu=\"${arch}\" target_environment=\"${ios_env}\"" "${output_dir}"
   else
-    echo "Build v8 ${arch} variant NO_INTL=${NO_INTL} NO_JIT=${NO_JIT}"
+    echo "Build v8 ${arch} variant NO_INTL=${NO_INTL} NO_JIT=${NO_JIT} EXTERNAL_STARTUP_DATA=${EXTERNAL_STARTUP_DATA}"
     output_dir="out.v8.${arch}"
     gn gen --args="${GN_ARGS_BASE} ${GN_ARGS_BUILD_TYPE} target_cpu=\"${arch}\"" "${output_dir}"
   fi

diff --git a/scripts/env.sh b/scripts/env.sh
@@ -48,9 +48,13 @@ IOS_DEPLOYMENT_TARGET="12.0"
 export PATH="$DEPOT_TOOLS_DIR:$PATH"
 PLATFORM=$(verify_platform $1)
 
-if [[ ${PLATFORM} = "android" ]]; then
-  EXTERNAL_STARTUP_DATA="false"
-else
-  EXTERNAL_STARTUP_DATA="false"
+if [[ -z ${EXTERNAL_STARTUP_DATA} ]]; then
+  if [[ ${PLATFORM} = "android" ]]; then
+    EXTERNAL_STARTUP_DATA="true"
+  else
+    EXTERNAL_STARTUP_DATA="false"
+  fi
+fi
+if [[ -z ${NO_JIT} && ${PLATFORM} = "ios" ]]; then
   NO_JIT="true"
 fi