8000 Merge pull request #23 from NativeScript/darind/v8.0.426.16 · NativeScript/android-v8@771d998 · GitHub
[go: up one dir, main page]
Skip to content

Commit 771d998

Browse files
darinddarind
authored
Merge pull request #23 from NativeScript/darind/v8.0.426.16
v8 8.0.426.16 update instructions
2 parents 4171d7d + b6f2ecf commit 771d998

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

‎7.9.317.31.patch renamed to ‎8.0.426.16.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/BUILD.gn b/BUILD.gn
2-
index 5df0619b1d..a4600d7cdc 100644
2+
index 90b7e33972..bfdcce03b1 100644
33
--- a/BUILD.gn
44
+++ b/BUILD.gn
5-
@@ -2048,6 +2048,8 @@ v8_source_set("v8_base_without_compiler") {
5+
@@ -1963,6 +1963,8 @@ v8_source_set("v8_base_without_compiler") {
66
"include/v8-wasm-trap-handler-posix.h",
77
"include/v8.h",
88
"include/v8config.h",
@@ -12,10 +12,10 @@ index 5df0619b1d..a4600d7cdc 100644
1212
"src/api/api-arguments.cc",
1313
"src/api/api-arguments.h",
1414
diff --git a/include/js_protocol.pdl b/include/js_protocol.pdl
15-
index 51f3c6f68a..06bc55096b 100644
15+
index 427d654cac..7866d02fa2 100644
1616
--- a/include/js_protocol.pdl
1717
+++ b/include/js_protocol.pdl
18-
@@ -1501,3 +1501,3107 @@ deprecated domain Schema
18+
@@ -1525,3 +1525,3107 @@ deprecated domain Schema
1919
returns
2020
# List of supported domains.
2121
array of Domain domains
@@ -3370,7 +3370,7 @@ index 0000000000..1bb4fc36e0
33703370
+ };
33713371
+}
33723372
diff --git a/src/inspector/inspector_protocol_config.json b/src/inspector/inspector_protocol_config.json
3373-
index 684940c885..077ff61b6d 100644
3373+
index 0fd6b2d5ec..8498e8e19d 100644
33743374
--- a/src/inspector/inspector_protocol_config.json
33753375
+++ b/src/inspector/inspector_protocol_config.json
33763376
@@ -26,6 +26,34 @@

‎README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ export PATH=`pwd`/depot_tools:"$PATH"
1515
sudo apt-get install curl libc6-dev-i386 g++-multilib
1616
```
1717

18-
* Download and extract Android NDK r20
18+
* Download and extract Android NDK r21
1919

2020
Mac OS:
2121
```
22-
curl -O https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip
23-
unzip android-ndk-r20-darwin-x86_64.zip -d ndkr20
22+
curl -O https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip
23+
unzip android-ndk-r21-darwin-x86_64.zip -d ndkr21
2424
```
2525
> You need to use XCode < 10 to be able to build v8
2626
2727
Linux:
2828
```
29-
curl -O https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip
30-
unzip android-ndk-r20-linux-x86_64.zip -d ndkr20
29+
curl -O https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip
30+
unzip android-ndk-r21-linux-x86_64.zip -d ndkr21
3131
```
3232

3333
* Export ANDROID_NDK_HOME environment variable
3434
```
35-
export ANDROID_NDK_HOME=`pwd`/ndkr20/android-ndk-r20
35+
export ANDROID_NDK_HOME=`pwd`/ndkr21/android-ndk-r21
3636
```
3737

3838
* `fetch v8` (this will create a `v8` repo folder and add a `.gclient` file)
@@ -54,10 +54,10 @@ solutions = [
5454
target_os = ['android']
5555
```
5656

57-
* checkout tag 7.9.317.31
57+
* checkout tag 8.0.426.16
5858
```
5959
cd v8
60-
git checkout 7.9.317.31
60+
git checkout 8.0.426.16
6161
```
6262

6363
* Run sync
@@ -67,6 +67,7 @@ gclient sync
6767

6868
* Create symlinks
6969
```
70+
cp third_party/android_tools third_party/android_ndk/BUILD.gn $ANDROID_NDK_HOME
7071
rm -rf third_party/android_tools third_party/android_ndk
7172
mkdir third_party/android_tools
7273
ln -s $ANDROID_NDK_HOME third_party/android_tools/ndk

‎build.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ do
5353
ARGS=
5454
if [[ $BUILD_TYPE == "debug" ]] ;then
5555
if $IS_LINUX; then
56-
gn gen $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=$IS_COMPONENT_BUILD v8_use_external_startup_data=true v8_enable_embedded_builtins=true is_debug=true symbol_level=2 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
56+
gn gen $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=$IS_COMPONENT_BUILD v8_use_external_startup_data=true is_debug=true symbol_level=2 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
5757
fi
58-
gn gen $BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=false v8_use_external_startup_data=true v8_enable_embedded_builtins=true is_debug=true symbol_level=2 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
58+
gn gen $BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=false v8_use_external_startup_data=true is_debug=true symbol_level=2 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
5959
else
6060
if $IS_LINUX; then
61-
gn gen $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=$IS_COMPONENT_BUILD v8_use_external_startup_data=true v8_enable_embedded_builtins=true is_official_build=true use_thin_lto=false is_debug=false symbol_level=0 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
61+
gn gen $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=$IS_COMPONENT_BUILD v8_use_external_startup_data=true is_official_build=true use_thin_lto=false is_debug=false symbol_level=0 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
6262
fi
63-
gn gen $BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=false v8_use_external_startup_data=true v8_enable_embedded_builtins=true is_official_build=true use_thin_lto=false is_debug=false symbol_level=0 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
63+
gn gen $BUILD_DIR_PREFIX/$SNAPSHOT_PREFIX$CURRENT_ARCH-$BUILD_TYPE --args="is_component_build=false v8_use_external_startup_data=true is_official_build=true use_thin_lto=false is_debug=false symbol_level=0 target_cpu=\"$CURRENT_ARCH\" v8_target_cpu=\"$CURRENT_ARCH\" v8_enable_i18n_support=false target_os=\"android\" v8_android_log_stdout=false"
6464

6565
fi
6666
done
@@ -70,7 +70,7 @@ COUNT=0
7070
for CURRENT_ARCH in ${ARCH_ARR[@]}
7171
do
7272
# make fat build
73-
V8_FOLDERS=(v8_compiler v8_base_without_compiler v8_libplatform v8_libbase v8_libsampler v8_external_snapshot v8_initializers v8_init torque_generated_initializers)
73+
V8_FOLDERS=(v8_compiler v8_base_without_compiler v8_libplatform v8_libbase v8_libsampler v8_snapshot v8_initializers v8_init torque_generated_initializers)
7474

7575
SECONDS=0
7676
if $IS_LINUX; then
@@ -93,6 +93,9 @@ do
9393
LAST_PARAM="${LAST_PARAM} ${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/${CURRENT_V8_FOLDER}/*.o"
9494
done
9595
2364
96+
LAST_PARAM="${LAST_PARAM} ${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/third_party/inspector_protocol/crdtp/*.o ${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/third_party/inspector_protocol/crdtp_platform/*.o"
97+
LAST_PARAM="${LAST_PARAM} ${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/third_party/zlib/zlib/*.o ${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/third_party/zlib/zlib_adler32_simd/*.o"
98+
9699
THIRD_PARTY_OUT=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/obj/buildtools/third_party
97100
LAST_PARAM="${LAST_PARAM} $THIRD_PARTY_OUT/libc++/libc++/*.o $THIRD_PARTY_OUT/libc++abi/libc++abi/*.o"
98101

0 commit comments

Comments
 (0)
0