Skip to content

Commit

Permalink
Upgrade V8 to V8.0.426.16 (#11)
Browse files Browse the repository at this point in the history
* Upgrade v8 to v8

* Try to fix Android build break

Summary:
    1. Fix libatomic.so.1 not found issue.
       mksnapshot for arm is based on i386 libatomic.so.1
       We should add libatomic1-i386-cross for Ubuntu 64.
       Since the installed files is at /usr/i686-linux-gnu/lib that is not
       default location, we should add the location explicitly.

    2. install-build-deps-android.sh will not install jdk now, install
       explicitly.

* Fix iOS build break

Summary:
    1. Suppress deprecated-copy and final-dtor-non-final-class errors
       which Xcode clang will complain.
    2. Disable pointer compression that will cause build break for
       arm64.
  • Loading branch information
Kudo authored Feb 10, 2020
1 parent 59ff4b9 commit 32356d2
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 12 deletions.
12 changes: 8 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget openjdk-8-jre openjdk-8-jdk
- checkout

Expand All @@ -30,6 +30,7 @@ jobs:
name: Setup V8 build environment
command: |
scripts/setup.sh -r ${V8_VERSION} android
sudo apt-get install -y libatomic1-i386-cross && sudo sh -c 'echo "/usr/i686-linux-gnu/lib" >> /etc/ld.so.conf.d/i386-linux-gnu.conf' && sudo ldconfig
- run:
name: Patch V8
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget openjdk-8-jre openjdk-8-jdk
- checkout

Expand All @@ -79,6 +80,7 @@ jobs:
name: Setup V8 build environment
command: |
scripts/setup.sh -r ${V8_VERSION} android
sudo apt-get install -y libatomic1-i386-cross && sudo sh -c 'echo "/usr/i686-linux-gnu/lib" >> /etc/ld.so.conf.d/i386-linux-gnu.conf' && sudo ldconfig
- run:
name: Patch V8
Expand Down Expand Up @@ -115,7 +117,7 @@ jobs:
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget openjdk-8-jre openjdk-8-jdk
- checkout

Expand All @@ -128,6 +130,7 @@ jobs:
name: Setup V8 build environment
command: |
scripts/setup.sh -r ${V8_VERSION} android
sudo apt-get install -y libatomic1-i386-cross && sudo sh -c 'echo "/usr/i686-linux-gnu/lib" >> /etc/ld.so.conf.d/i386-linux-gnu.conf' && sudo ldconfig
- run:
name: Patch V8
Expand Down Expand Up @@ -164,7 +167,7 @@ jobs:
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget
sudo apt-get install -y apt-utils sudo lsb-core git python nodejs npm wget openjdk-8-jre openjdk-8-jdk
- checkout

Expand All @@ -177,6 +180,7 @@ jobs:
name: Setup V8 build environment
command: |
scripts/setup.sh -r ${V8_VERSION} android
sudo apt-get install -y libatomic1-i386-cross && sudo sh -c 'echo "/usr/i686-linux-gnu/lib" >> /etc/ld.so.conf.d/i386-linux-gnu.conf' && sudo ldconfig
- run:
name: Patch V8
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "7.8.2",
"version": "8.80.0",
"workspaces": [
"packages/*"
],
Expand All @@ -15,6 +15,6 @@
"start_ios": "bash -c '. ./scripts/export_npm_env.sh && ./scripts/start.sh ios'"
},
"config": {
"V8": "7.8.279.23"
"V8": "8.0.426.16"
}
}
2 changes: 1 addition & 1 deletion patches/v8_shared_library.patch
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ index c486f1a..6aeb762 100644
+ ":v8",
+ ":v8_libbase",
+ ":v8_libplatform",
+ ":v8_maybe_snapshot",
+ ":v8_snapshot",
+ ]
+
+ configs = [ ":internal_config" ]
Expand Down
19 changes: 16 additions & 3 deletions patches/v8_shared_library_ios.patch
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ index c486f1a..6aeb762 100644
+ ":v8",
+ ":v8_libbase",
+ ":v8_libplatform",
+ ":v8_maybe_snapshot",
+ ":v8_snapshot",
+ ]
+
+ configs = [ ":internal_config" ]
Expand All @@ -97,10 +97,10 @@ index e55c4cf..a97111b 100644
+ }
+}
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 66c2c43a6..bc01c3e14 100644
index cba0602f8..1e4ae504f 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1493,6 +1493,13 @@ config("default_warnings") {
@@ -1513,6 +1513,13 @@ config("default_warnings") {
cflags += [ "-Wno-nonportable-include-path" ]
}

Expand All @@ -114,3 +114,16 @@ index 66c2c43a6..bc01c3e14 100644
if (current_toolchain == host_toolchain || !use_xcode_clang) {
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
@@ -1557,6 +1564,12 @@ config("default_warnings") {
}
}
}
+ if (use_xcode_clang) {
+ cflags_cc += [
+ "-Wno-deprecated-copy",
+ "-Wno-final-dtor-non-final-class",
+ ]
+ }
}

# chromium_code ---------------------------------------------------------------
3 changes: 1 addition & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ GN_ARGS_BASE="
is_component_build=false
use_debug_fission=false
use_custom_libcxx=false
v8_use_snapshot=true
v8_use_external_startup_data=false
icu_use_data_file=false
"

if [[ ${PLATFORM} = "ios" ]]; then
GN_ARGS_BASE="${GN_ARGS_BASE} enable_ios_bitcode=false use_xcode_clang=true ios_enable_code_signing=false ios_deployment_target=${IOS_DEPLOYMENT_TARGET}"
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}"
fi

if [[ ${NO_INTL} = "1" ]]; then
Expand Down

0 comments on commit 32356d2

Please sign in to comment.