Skip to content

Commit be0bbe7

Browse files
authoredJun 7, 2019
Merge pull request #15 from NativeScript/darind/v7.5.288.22
v8 7.5.288.22 update instructions
2 parents c23aa94 + ad8c117 commit be0bbe7

File tree

3 files changed

+28
-22
lines changed

3 files changed

+28
-22
lines changed
 

‎7.4.288.25.patch renamed to ‎7.5.288.22.patch

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/BUILD.gn b/BUILD.gn
2-
index fddd525297..730127a7ec 100644
2+
index 10fee26420..ba472209e8 100644
33
--- a/BUILD.gn
44
+++ b/BUILD.gn
5-
@@ -1606,6 +1606,8 @@ v8_source_set("v8_base") {
5+
@@ -1958,6 +1958,8 @@ v8_source_set("v8_base_without_compiler") {
66
"include/v8-wasm-trap-handler-posix.h",
77
"include/v8.h",
88
"include/v8config.h",
@@ -259,7 +259,7 @@ index 0000000000..c8634677ac
259259
+ };
260260
+}
261261
diff --git a/src/inspector/inspector_protocol_config.json b/src/inspector/inspector_protocol_config.json
262-
index c4aa29ce99..3fbe51337b 100644
262+
index c4aa29ce99..299cfbe24a 100644
263263
--- a/src/inspector/inspector_protocol_config.json
264264
+++ b/src/inspector/inspector_protocol_config.json
265265
@@ -26,6 +26,37 @@
@@ -269,14 +269,14 @@ index c4aa29ce99..3fbe51337b 100644
269269
+ },
270270
+ {
271271
+ "domain": "Page",
272-
+ "exclude": ["getNavigationHistory", "navigateToHistoryEntry", "resetNavigationHistory", "captureScreenshot", "screencastFrameAck", "handleJavaScriptDialog", "setColorPickerEnabled",
272+
+ "exclude": ["getNavigationHistory", "navigateToHistoryEntry", "resetNavigationHistory", "captureScreenshot", "screencastFrameAck", "handleJavaScriptDialog", "setColorPickerEnabled",
273273
+ "getAppManifest", "setControlNavigations", "processNavigation", "printToPDF", "bringToFront", "setDownloadBehavior", "navigate", "crash", "close", "setWebLifecycleState", "captureSnapshot"],
274274
+ "async": ["getResourceContent", "searchInResource"],
275275
+ "exclude_events": ["screencastFrame", "screencastVisibilityChanged", "colorPicked", "interstitialShown", "interstitialHidden", "javascriptDialogOpening", "javascriptDialogClosed", "navigationRequested"]
276276
+ },
277277
+ {
278278
+ "domain": "Network",
279-
+ "exclude": ["clearBrowserCache", "clearBrowserCookies", "getCookies", "getAllCookies", "deleteCookies", "setCookie", "setCookies", "canEmulateNetworkConditions",
279+
+ "exclude": ["clearBrowserCache", "clearBrowserCookies", "getCookies", "getAllCookies", "deleteCookies", "setCookie", "setCookies", "canEmulateNetworkConditions",
280280
+ "setRequestInterception", "continueInterceptedRequest", "getResponseBodyForInterception",
281281
+ "takeResponseBodyForInterceptionAsStream"],
282282
+ "async": ["getResponseBody", "getRequestPostData"]
@@ -286,7 +286,7 @@ index c4aa29ce99..3fbe51337b 100644
286286
+ },
287287
+ {
288288
+ "domain": "CSS",
289-
+ "async": ["enable"]
289+
+ "async": ["enable"]
290290
+ },
291291
+ {
292292
+ "domain": "Overlay"
@@ -296,19 +296,20 @@ index c4aa29ce99..3fbe51337b 100644
296296
+ },
297297
+ {
298298
+ "domain": "Security",
299-
+ "include": []
299+
+ "include": []
300300
}
301301
]
302302
},
303303
diff --git a/src/inspector/js_protocol.pdl b/src/inspector/js_protocol.pdl
304-
index 93c988ea30..f4e5262466 100644
304+
index e4715f47ef..e588be7051 100644
305305
--- a/src/inspector/js_protocol.pdl
306306
+++ b/src/inspector/js_protocol.pdl
307-
@@ -1462,3 +1462,3107 @@ deprecated domain Schema
307+
@@ -1478,3 +1478,3108 @@ deprecated domain Schema
308308
returns
309309
# List of supported domains.
310310
array of Domain domains
311311
+
312+
+
312313
+# Actions and events related to the inspected page belong to the page domain.
313314
+domain Page
314315
+ depends on Debugger

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ ln -s $ANDROID_NDK_HOME third_party/android_tools/ndk
4545
ln -s $ANDROID_NDK_HOME third_party/android_ndk
4646
```
4747

48-
* checkout tag 7.4.288.25
48+
* checkout tag 7.5.288.22
4949
```
50-
git checkout 7.4.288.25
50+
git checkout 7.5.288.22
5151
```
5252

5353
* Run sync

‎build.sh

+16-11
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ COUNT=0
6969
for CURRENT_ARCH in ${ARCH_ARR[@]}
7070
do
7171
# make fat build
72-
V8_FOLDERS=(v8_base v8_libplatform v8_libbase v8_libsampler v8_external_snapshot v8_initializers v8_init)
72+
V8_FOLDERS=(v8_compiler v8_base_without_compiler v8_libplatform v8_libbase v8_libsampler v8_external_snapshot v8_initializers v8_init torque_generated_initializers)
7373

7474
SECONDS=0
7575
ninja -C $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE ${V8_FOLDERS[@]} inspector
@@ -84,21 +84,16 @@ do
8484
CURRENT_BUILD_TOOL=${NDK_BUILD_TOOLS_ARR[$COUNT]}
8585
COUNT=$COUNT+1
8686
V8_FOLDERS_LEN=${#V8_FOLDERS[@]}
87+
LAST_PARAM=""
8788
for CURRENT_V8_FOLDER in ${V8_FOLDERS[@]}
8889
do
89-
LAST_PARAM=${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/${CURRENT_V8_FOLDER}/*.o
90-
eval $CURRENT_BUILD_TOOL/ar r $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/obj/$CURRENT_V8_FOLDER/lib$CURRENT_V8_FOLDER.a "${LAST_PARAM}"
91-
mv $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/obj/$CURRENT_V8_FOLDER/lib$CURRENT_V8_FOLDER.a $DIST/$CURRENT_ARCH-$BUILD_TYPE
90+
LAST_PARAM="${LAST_PARAM} ${BUILD_DIR_PREFIX}/${CURRENT_ARCH}-${BUILD_TYPE}/obj/${CURRENT_V8_FOLDER}/*.o"
9291
done
9392

94-
echo "=================================="
95-
echo "=================================="
96-
echo "Preparing libc++ and libc++abi libraries for $CURRENT_ARCH"
97-
echo "=================================="
98-
echo "=================================="
9993
THIRD_PARTY_OUT=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/obj/buildtools/third_party
100-
eval $CURRENT_BUILD_TOOL/ar r $DIST/$CURRENT_ARCH-$BUILD_TYPE/libc++.a $THIRD_PARTY_OUT/libc++/libc++/*.o
101-
eval $CURRENT_BUILD_TOOL/ar r $DIST/$CURRENT_ARCH-$BUILD_TYPE/libc++abi.a $THIRD_PARTY_OUT/libc++abi/libc++abi/*.o
94+
LAST_PARAM="${LAST_PARAM} $THIRD_PARTY_OUT/libc++/libc++/*.o $THIRD_PARTY_OUT/libc++abi/libc++abi/*.o"
95+
96+
eval $CURRENT_BUILD_TOOL/ar r $DIST/$CURRENT_ARCH-$BUILD_TYPE/libv8.a "${LAST_PARAM}"
10297

10398
echo "=================================="
10499
echo "=================================="
@@ -127,6 +122,16 @@ do
127122

128123
INCLUDE="$(pwd)/dist/$CURRENT_ARCH-$BUILD_TYPE/include"
129124
mkdir -p $INCLUDE
125+
126+
SOURCE_DIR=
127+
if [[ $CURRENT_ARCH == "arm64" ]] ;then
128+
SOURCE_DIR=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/clang_x64_v8_$CURRENT_ARCH
129+
elif [[ $CURRENT_ARCH == "arm" ]] ;then
130+
SOURCE_DIR=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/clang_x86_v8_$CURRENT_ARCH
131+
elif [[ $CURRENT_ARCH == "x86" ]] ;then
132+
SOURCE_DIR=$BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE/clang_x86
133+
fi
134+
130135
pushd $SOURCE_DIR/..
131136
xxd -i snapshot_blob.bin > $INCLUDE/snapshot_blob.h
132137
xxd -i natives_blob.bin > $INCLUDE/natives_blob.h

0 commit comments

Comments
 (0)