Remove support for external startup data

This makes V8 always build with v8_use_external_startup_data=false.
Since that was previously controlled by the EXTERNAL_STARTUP_DATA
variable, we can remove that variable. If we're not using external startup
heap snapshots, we also don't need to export mksnapshot and mkcodecache;
they are now only used internally by the V8 build. This also makes a
TOOLS_ONLY build and therefore a tools_macos_android build obsolete.

Summary:
- Remove EXTERNAL_STARTUP_DATA
- Remove TOOLS_ONLY
- Remove MKSNAPSHOT_ONLY
- Remove MKCODECACHE_ONLY
- Remove patch to allow monolithic build with external startup data
- Remove patch to export mkcodecache
- Remove tools_macos_android workflow

Author: ptomato

.github/workflows/tools_macos_android.yml

@@ -11,8 +11,7 @@
     "setup_ios": "bash -c '. ./scripts/export_npm_env.sh && ./scripts/setup.sh ios'",
     "setup_macos_android": "bash -c '. ./scripts/export_npm_env.sh && ./scripts/setup.sh macos_android'",
     "start": "bash -c '. ./scripts/export_npm_env.sh && ./scripts/start.sh android'",
-    "start_ios": "bash -c '. ./scripts/export_npm_env.sh && ./scripts/start.sh ios'",
-    "start_tools_macos_android": "bash -c '. ./scripts/export_npm_env.sh && TOOLS_ONLY=true ./scripts/start.sh macos_android'"
+    "start_ios": "bash -c '. ./scripts/export_npm_env.sh && ./scripts/start.sh ios'"
   },
   "config": {
     "V8": "10.3.22"

package.json

@@ -2,11 +2,6 @@
 source $(dirname $0)/env.sh
 
 function makeDistPackageDir() {
-  if [[ ${TOOLS_ONLY} = "true" ]]; then
-    echo "${DIST_DIR}/packages/v8-android-tools"
-    return 0
-  fi
-
   local jit_suffix=""
   local intl_suffix=""
   if [[ ${NO_JIT} != "true" ]]; then
@@ -58,25 +53,6 @@ function copyHeaders() {
   cp -Rf "${V8_DIR}/include" "${DIST_PACKAGE_DIR}/include"
 }
 
-function copyTools() {
-  printf "\n\n\t\t===================== adding tools to ${DIST_PACKAGE_DIR}/tools =====================\n\n"
-  cp -Rf "${BUILD_DIR}/tools" "${DIST_PACKAGE_DIR}/"
-}
-
-function copySnapshotBlobIfNeeded() {
-  if [[ ${EXTERNAL_STARTUP_DATA} = "true" || ${TOOLS_ONLY} = "true" ]]; then
-    printf "\n\n\t\t===================== adding snapshot_blob to ${DIST_PACKAGE_DIR}/snapshot_blob =====================\n\n"
-    cp -Rf "${BUILD_DIR}/snapshot_blob" "${DIST_PACKAGE_DIR}/"
-  fi
-}
-
-
-if [[ ${TOOLS_ONLY} = "true" ]]; then
-  mkdir -p "$DIST_PACKAGE_DIR"
-  copyTools
-  exit 0
-fi
-
 if [[ ${PLATFORM} = "android" ]]; then
   # export ANDROID_HOME="${V8_DIR}/third_party/android_sdk/public"
   # export ANDROID_NDK="${V8_DIR}/third_party/android_ndk"
@@ -87,11 +63,7 @@ if [[ ${PLATFORM} = "android" ]]; then
   copyDylib
   # copyAndroidTools
   # copyHeaders
-  # copyTools
-  copySnapshotBlobIfNeeded
 elif [[ ${PLATFORM} = "ios" ]]; then
   copyDylib
   # copyHeaders
-  # copyTools
-  # copySnapshotBlobIfNeeded
 fi

patches/mkcodecache.patch

@@ -18,15 +18,11 @@ GN_ARGS_BASE="
   v8_enable_v8_checks=false
   v8_enable_debugging_features=false
   v8_enable_webassembly=true
+  v8_use_external_startup_data=false
   is_official_build=true
+  target_os=\"${PLATFORM}\"
 "
 
-if [[ ${PLATFORM} = "macos_android" ]]; then
-  GN_ARGS_BASE="${GN_ARGS_BASE} target_os=\"android\" host_cpu=\"x64\""
-else
-  GN_ARGS_BASE="${GN_ARGS_BASE} target_os=\"${PLATFORM}\""
-fi
-
 if [[ ${PLATFORM} = "ios" ]]; then
   GN_ARGS_BASE="${GN_ARGS_BASE} enable_ios_bitcode=false use_xcode_clang=true ios_enable_code_signing=false v8_enable_pointer_compression=false ios_deployment_target=\"${IOS_DEPLOYMENT_TARGET}\""
 elif [[ ${PLATFORM} = "android" ]]; then
@@ -42,12 +38,6 @@ if [[ ${NO_JIT} = "true" ]]; then
   GN_ARGS_BASE="${GN_ARGS_BASE} v8_enable_lite_mode=true"
 fi
 
-if [[ ${EXTERNAL_STARTUP_DATA} = "true" || ${TOOLS_ONLY} = "true" ]]; then
-  GN_ARGS_BASE="${GN_ARGS_BASE} v8_use_external_startup_data=true"
-else
-  GN_ARGS_BASE="${GN_ARGS_BASE} v8_use_external_startup_data=false"
-fi
-
 if [[ "$BUILD_TYPE" = "Debug" ]]
 then
   GN_ARGS_BUILD_TYPE='
@@ -105,16 +95,8 @@ function buildArch()
   echo "Build v8 ${arch} variant NO_INTL=${NO_INTL} NO_JIT=${NO_JIT}"
   gn gen --args="${GN_ARGS_BASE} ${GN_ARGS_BUILD_TYPE} v8_target_cpu=\"${arch}\" target_cpu=\"${arch}\"" "out.v8.${arch}"
 
-  if [[ ${TOOLS_ONLY} = "true" ]]; then
-    date ; ninja ${NINJA_PARAMS} -C "out.v8.${arch}" run_mksnapshot_default mkcodecache_group ; date
-    copySnapshot $arch
-    copyMkcodecache $arch
- else
-    date ; ninja ${NINJA_PARAMS} -C "out.v8.${arch}" ; date
-    copyLib $arch
-    copySnapshot $arch
-    # copyMkcodecache $arch
-  fi
+  date ; ninja ${NINJA_PARAMS} -C "out.v8.${arch}" ; date
+  copyLib $arch
 }
 
 function copyLib()
@@ -131,33 +113,6 @@ function copyLib()
   fi
 }
 
-function copySnapshot()
-{
-  local arch=$1
-  local platform_arch=$(normalize_arch_for_platform $arch)
-
-  mkdir -p "${BUILD_DIR}/tools/${PLATFORM}/${platform_arch}"
-  cp -f out.v8.${arch}/clang_*/mksnapshot "${BUILD_DIR}/tools/${PLATFORM}/${platform_arch}/mksnapshot"
-
-  if [[ ${EXTERNAL_STARTUP_DATA} = "true" || ${TOOLS_ONLY} = "true" ]]; then
-    mkdir -p "${BUILD_DIR}/snapshot_blob/${platform_arch}"
-    cp -f out.v8.${arch}/snapshot_blob.bin "${BUILD_DIR}/snapshot_blob/${platform_arch}/snapshot_blob.bin"
-  fi
-}
-
-function copyMkcodecache()
-{
-  local arch=$1
-  local platform_arch=$(normalize_arch_for_platform $arch)
-
-  mkdir -p "${BUILD_DIR}/tools/${PLATFORM}/${platform_arch}"
-  cp -f out.v8.${arch}/clang_*/mkcodecache "${BUILD_DIR}/tools/${PLATFORM}/${platform_arch}/mkcodecache"
-
-  if [[ ${EXTERNAL_STARTUP_DATA} = "true" || ${TOOLS_ONLY} = "true" ]]; then
-    cp -f out.v8.${arch}/clang_*/snapshot_blob.bin "${BUILD_DIR}/tools/${PLATFORM}/${platform_arch}/snapshot_blob.bin"
-  fi
-}
-
 if [[ ${ARCH} ]]; then
   buildArch "${ARCH}"
 elif [[ ${PLATFORM} = "android" ]]; then
@@ -168,9 +123,4 @@ elif [[ ${PLATFORM} = "android" ]]; then
 elif [[ ${PLATFORM} = "ios" ]]; then
   buildArch "arm64"
   # buildArch "x64"
-elif [[ ${PLATFORM} = "macos_android" ]]; then
-  # buildArch "arm"
-  # buildArch "x86"
-  buildArch "arm64"
-  buildArch "x64"
 fi

patches/v8_monolith_snapshot.patch

@@ -17,7 +17,7 @@ function abs_path()
 function verify_platform()
 {
   local arg=$1
-  SUPPORTED_PLATFORMS=(android ios macos_android)
+  SUPPORTED_PLATFORMS=(android ios)
   local valid_platform=
   for platform in ${SUPPORTED_PLATFORMS[@]}
   do
@@ -44,7 +44,6 @@ PATCHES_DIR="${ROOT_DIR}/patches"
 
 NDK_VERSION="r21e"
 IOS_DEPLOYMENT_TARGET="9"
-EXTERNAL_STARTUP_DATA="true"
 
 export PATH="$DEPOT_TOOLS_DIR:$PATH"
 PLATFORM=$(verify_platform $1)

scripts/archive.sh

@@ -5,8 +5,6 @@ source $(dirname $0)/env.sh
 # Patchset management that manage files by commented purpose
 ######################################################################################
 V8_PATCHSET_ANDROID=(
-  "v8_monolith_snapshot.patch"
-  
   # V8 shared library support
   # "v8_shared_library.patch"
 
@@ -24,9 +22,6 @@ V8_PATCHSET_ANDROID=(
   # revert https://chromium.googlesource.com/chromium/src/build/+/7bb5f36104
   "v8_97_android_unwind_link_error.patch"
 
-  # Add mkcodecache tool
-  "mkcodecache.patch"
-
   # Fix for [react-native-bottom-sheet](https://github.com/gorhom/react-native-bottom-sheet) not working
   # revert https://chromium-review.googlesource.com/c/v8/v8/+/3548458
   # "fix_for_bottom_sheet.patch"
@@ -45,19 +40,11 @@ V8_PATCHSET_IOS=(
   # Fix use_system_xcode build error
   "system_xcode_build_error.patch"
 
-  # Add mkcodecache tool
-  "mkcodecache.patch"
-
   # Fix for [react-native-bottom-sheet](https://github.com/gorhom/react-native-bottom-sheet) not working
   # revert https://chromium-review.googlesource.com/c/v8/v8/+/3548458
   # "fix_for_bottom_sheet.patch"
 )
 
-V8_PATCHSET_MACOS_ANDROID=(
-  # Add mkcodecache tool
-  "mkcodecache.patch"
-)
-
 ######################################################################################
 # Patchset management end
 ######################################################################################
@@ -73,11 +60,6 @@ function setupNDK() {
   unset ndk_major_version
 }
 
-function setupMkCodecache() {
-  mkdir -p "${V8_DIR}/src/mkcodecache"
-  cp -f "${ROOT_DIR}/mkcodecache/mkcodecache.cc" "${V8_DIR}/src/mkcodecache/"
-}
-
 if [[ ${PLATFORM} = "android" ]]; then
   for patch in "${V8_PATCHSET_ANDROID[@]}"
   do
@@ -86,22 +68,11 @@ if [[ ${PLATFORM} = "android" ]]; then
   done
 
   setupNDK
-  setupMkCodecache
 elif [[ ${PLATFORM} = "ios" ]]; then
   for patch in "${V8_PATCHSET_IOS[@]}"
   do
     printf "### Patch set: ${patch}\n"
     patch -d "${V8_DIR}" -p1 < "${PATCHES_DIR}/$patch"
   done
 
-  setupMkCodecache
-elif [[ ${PLATFORM} = "macos_android" ]]; then
-  for patch in "${V8_PATCHSET_MACOS_ANDROID[@]}"
-  do
-    printf "### Patch set: ${patch}\n"
-    patch -d "${V8_DIR}" -p1 < "${PATCHES_DIR}/$patch"
-  done
-
-  setupNDK
-  setupMkCodecache
 fi

scripts/build.sh

@@ -17,12 +17,12 @@ source $(dirname $0)/env.sh
 
 # Install NDK
 function installNDK() {
-  local host_arch=$1
+  local ndk_filename="android-ndk-${NDK_VERSION}-linux-x86_64.zip"
   pushd .
   cd "${V8_DIR}"
-  wget -q https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-${host_arch}-x86_64.zip
-  unzip -q android-ndk-${NDK_VERSION}-${host_arch}-x86_64.zip
-  rm -f android-ndk-${NDK_VERSION}-${host_arch}-x86_64.zip
+  wget -q "https://dl.google.com/android/repository/${ndk_filename}"
+  unzip -q "$ndk_filename"
+  rm -f "$ndk_filename"
   popd
 }
 
@@ -70,15 +70,6 @@ if [[ ${PLATFORM} = "android" ]]; then
   # Workaround to install missing android_sdk tools
   gclient sync --deps=android
 
-  installNDK "linux"
-  exit 0
-fi
-
-if [[ ${PLATFORM} = "macos_android" ]]; then
-  gclient sync --deps=android ${GCLIENT_SYNC_ARGS} || true
-  sed -i "" "s#2c2138e811487b13020eb331482fb991fd399d4e#083aa67a0d3309ebe37eafbe7bfd96c235a019cf#g" v8/DEPS
-  gclient sync --deps=android
-
-  installNDK "darwin"
+  installNDK
   exit 0
 fi