-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrate ARM64 binaries into the main sequence build script.
- Loading branch information
1 parent
7c9bd2a
commit 9d9200c
Showing
3 changed files
with
168 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| export NWJS_BRANCH="$1" | ||
| export WORKDIR="/usr/docker" | ||
| export NWJSDIR=${WORKDIR}/nwjs | ||
| export DEPOT_TOOLS_DIRECTORY=${WORKDIR}/depot_tools | ||
| export PATH=${PATH}:${DEPOT_TOOLS_DIRECTORY} | ||
| export LC_ALL=C.UTF-8 | ||
| export GYP_CHROMIUM_NO_ACTION=0 | ||
|
|
||
| function applyPatch { | ||
| # See https://gist.github.com/llamasoft/33af03b73945a84d7624460d67b922ab | ||
| # For nwjs_sdk=false builds, some required(?) files never get built. | ||
| # As a workaround, always use the SDK's GRIT input regardless of the flag. | ||
| # See: https://github.com/nwjs/chromium.src/issues/145 | ||
| cd $NWJSDIR/src | ||
| patch -p0 --ignore-whitespace << 'PATCH' | ||
| --- chrome/browser/BUILD.gn | ||
| +++ chrome/browser/BUILD.gn | ||
| @@ -6499,11 +6499,7 @@ proto_library("permissions_proto") { | ||
| } | ||
| grit("resources") { | ||
| - if (nwjs_sdk) { | ||
| - source = "browser_resources.grd" | ||
| - } else { | ||
| - source = "nwjs_resources.grd" | ||
| - } | ||
| + source = "browser_resources.grd" | ||
| # Required due to flattenhtml = "true" on a generated file. | ||
| enable_input_discovery_for_gn_analyze = false | ||
| PATCH | ||
|
|
||
| patch -p0 --ignore-whitespace << 'PATCH' | ||
| --- build/config/linux/atk/BUILD.gn | ||
| +++ build/config/linux/atk/BUILD.gn | ||
| @@ -10,7 +10,7 @@ import("//build/config/ui.gni") | ||
| assert(!is_chromeos) | ||
| # These packages should _only_ be expected when building for a target. | ||
| -assert(current_toolchain == default_toolchain) | ||
| +# assert(current_toolchain == default_toolchain) | ||
| if (use_atk) { | ||
| assert(use_glib, "use_atk=true requires that use_glib=true") | ||
| PATCH | ||
|
|
||
| patch -p0 --ignore-whitespace << 'PATCH' | ||
| --- third_party/node-nw/common.gypi | ||
| +++ third_party/node-nw/common.gypi | ||
| @@ -132,6 +132,9 @@ | ||
| ['OS=="linux" and target_arch=="arm" and <(building_nw)==1', { | ||
| 'sysroot': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_arm-sysroot', | ||
| }], | ||
| + ['OS=="linux" and target_arch=="arm64" and <(building_nw)==1', { | ||
| + 'sysroot': '<!(cd <(DEPTH) && pwd -P)/build/linux/debian_sid_arm64-sysroot', | ||
| + }], | ||
| ['openssl_fips != ""', { | ||
| 'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)', | ||
| }, { | ||
| @@ -584,6 +587,10 @@ | ||
| 'cflags': [ '--target=arm-linux-gnueabihf' ], | ||
| 'ldflags': [ '--target=arm-linux-gnueabihf' ], | ||
| }], | ||
| + [ 'OS=="linux" and target_arch=="arm64"', { | ||
| + 'cflags': [ '--target=aarch64-linux-gnu' ], | ||
| + 'ldflags': [ '--target=aarch64-linux-gnu' ], | ||
| + }], | ||
| [ 'target_arch=="ppc" and OS!="aix"', { | ||
| 'cflags': [ '-m32' ], | ||
| 'ldflags': [ '-m32' ], | ||
| PATCH | ||
|
|
||
| patch -p0 --ignore-whitespace << 'PATCH' | ||
| --- build/config/linux/atspi2/BUILD.gn | ||
| +++ build/config/linux/atspi2/BUILD.gn | ||
| @@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni") | ||
| import("//build/config/ui.gni") | ||
| # These packages should _only_ be expected when building for a target. | ||
| -assert(current_toolchain == default_toolchain) | ||
| +# assert(current_toolchain == default_toolchain) | ||
| if (use_atk) { | ||
| pkg_config("atspi2") { | ||
| PATCH | ||
| } | ||
|
|
||
| function build { | ||
| cd $NWJSDIR/src | ||
| gn gen out/nw --args="${1} enable_widevine=false is_component_ffmpeg=true is_debug=false symbol_level=1 target_os=\"linux\" target_cpu=\"arm64\"" | ||
| $NWJSDIR/src/build/gyp_chromium -I third_party/node-nw/common.gypi third_party/node-nw/node.gyp | ||
| ninja -C out/nw nwjs | ||
| ninja -C out/Release node | ||
| ninja -C out/nw copy_node | ||
| temp_dir=$(mktemp -d) | ||
| OLD_PATH="${PATH}" | ||
| export PATH="${temp_dir}:${PATH}" | ||
|
|
||
| # Typically under `third_party/llvm-build/Release+Asserts/bin`, but search for it just in case. | ||
| objcopy=$(find . -type f -name "llvm-objcopy" | head -1 | xargs -n 1 realpath) | ||
| cat > "${temp_dir}/strip" <<STRIP_SCRIPT | ||
| #!/bin/sh | ||
| "${objcopy}" --strip-unneeded "\$@" | ||
| STRIP_SCRIPT | ||
| chmod +x "${temp_dir}/strip" | ||
|
|
||
| ninja -C out/nw dump | ||
|
|
||
| export PATH="${OLD_PATH}" | ||
| rm -rf "${temp_dir}" | ||
|
|
||
| ninja -C out/nw dist | ||
| } | ||
|
|
||
| applyPatch | ||
|
|
||
| if [ -d "${WORKDIR}/dist" ]; then rm -r ${WORKDIR}/dist; fi | ||
|
|
||
| COMMON_GYP_DEFINES="enable_widevine=0 building_nw=1 buildtype=Official clang=1 OS=linux target_arch=arm64" | ||
|
|
||
| export GYP_DEFINES="nwjs_sdk=0 disable_nacl=1 $COMMON_GYP_DEFINES" | ||
| build "nwjs_sdk=false enable_nacl=false" | ||
| mkdir -p ${WORKDIR}/dist/nwjs-chromium-ffmpeg-branding | ||
| cp ${NWJSDIR}/src/out/nw/dist/** ${WORKDIR}/dist/nwjs-chromium-ffmpeg-branding | ||
|
|
||
| export GYP_DEFINES="nwjs_sdk=0 disable_nacl=1 $COMMON_GYP_DEFINES" | ||
| build "nwjs_sdk=false enable_nacl=false ffmpeg_branding=\"Chrome\"" | ||
| mkdir -p ${WORKDIR}/dist/nwjs-chrome-ffmpeg-branding | ||
| cp ${NWJSDIR}/src/out/nw/dist/** ${WORKDIR}/dist/nwjs-chrome-ffmpeg-branding | ||
|
|
||
| # Disabled the SDK build because the build fails. | ||
|
|
||
| # export GYP_DEFINES="nwjs_sdk=1 disable_nacl=0 $COMMON_GYP_DEFINES" | ||
| # build "nwjs_sdk=true enable_nacl=true" | ||
| # mkdir -p ${WORKDIR}/dist/nwjs-sdk-chromium-ffmpeg-branding | ||
| # cp ${NWJSDIR}/src/out/nw/dist/** ${WORKDIR}/dist/nwjs-sdk-chromium-ffmpeg-branding | ||
|
|
||
| # export GYP_DEFINES="nwjs_sdk=1 disable_nacl=0 $COMMON_GYP_DEFINES" | ||
| # build "nwjs_sdk=true enable_nacl=true ffmpeg_branding=\"Chrome\"" | ||
| # mkdir -p ${WORKDIR}/dist/nwjs-sdk-chrome-ffmpeg-branding | ||
| # cp ${NWJSDIR}/src/out/nw/dist/** ${WORKDIR}/dist/nwjs-sdk-chrome-ffmpeg-branding |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters