Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v8 6.7.288.46 update instructions #5

Merged
merged 1 commit into from
Jun 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 12 additions & 37 deletions 6.6.346.23.patch → 6.7.288.46.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/BUILD.gn b/BUILD.gn
index 72a19b2..698a6b5 100644
index 4b48f7d..6b12c99 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -332,7 +332,7 @@ config("toolchain") {
@@ -347,7 +347,7 @@ config("toolchain") {
visibility = [ ":*" ] # Only targets in this file can depend on this.

defines = []
Expand All @@ -11,7 +11,7 @@ index 72a19b2..698a6b5 100644
ldflags = []

if (v8_current_cpu == "arm") {
@@ -1224,6 +1224,8 @@ v8_source_set("v8_base") {
@@ -1325,6 +1325,8 @@ v8_source_set("v8_base") {
"include/v8-util.h",
"include/v8.h",
"include/v8config.h",
Expand Down Expand Up @@ -278,10 +278,10 @@ index 0000000..864ee3c
+}
+
diff --git a/src/api.cc b/src/api.cc
index 8531cd5..4572619 100644
index 8b177d0..b6b5ef4 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -515,8 +515,22 @@ bool RunExtraCode(Isolate* isolate, Local<Context> context,
@@ -506,8 +506,22 @@ bool RunExtraCode(Isolate* isolate, Local<Context> context,
ScriptOrigin origin(resource_name);
ScriptCompiler::Source source(source_string, origin);
Local<Script> script;
Expand All @@ -307,7 +307,7 @@ index 8531cd5..4572619 100644
i::PrintF("Executing custom snapshot script %s took %0.3f ms\n", name,
timer.Elapsed().InMillisecondsF());
diff --git a/src/inspector/inspector_protocol_config.json b/src/inspector/inspector_protocol_config.json
index fdb2b64..2752d42 100644
index fa07312..d7e2cef 100644
--- a/src/inspector/inspector_protocol_config.json
+++ b/src/inspector/inspector_protocol_config.json
@@ -27,6 +27,27 @@
Expand All @@ -316,9 +316,6 @@ index fdb2b64..2752d42 100644
"domain": "HeapProfiler"
+ },
+ {
+ "domain": "GenericTypes"
+ },
+ {
+ "domain": "Page"
+ },
+ {
Expand All @@ -335,42 +332,22 @@ index fdb2b64..2752d42 100644
+ },
+ {
+ "domain": "Log"
+ },
+ {
+ "domain": "Security"
}
]
},
diff --git a/src/inspector/js_protocol.json b/src/inspector/js_protocol.json
index a0f7fcd..ab1fff9 100644
index eb8785d..e07ea13 100644
--- a/src/inspector/js_protocol.json
+++ b/src/inspector/js_protocol.json
@@ -2961,6 +2961,6856 @@
@@ -3005,6 +3005,6831 @@
]
}
]
+ },
+ {
+ "domain": "GenericTypes",
+ "description": "Exposes generic types to be used by any domain.",
+ "types": [
+ {
+ "id": "SearchMatch",
+ "type": "object",
+ "description": "Search match in a resource.",
+ "properties": [
+ {
+ "name": "lineNumber",
+ "type": "number",
+ "description": "Line number in resource content."
+ },
+ {
+ "name": "lineContent",
+ "type": "string",
+ "description": "Line with match content."
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "domain": "Page",
+ "description": "Actions and events related to the inspected page belong to the page domain.",
+ "dependencies": [
Expand Down Expand Up @@ -1947,8 +1924,6 @@ index a0f7fcd..ab1fff9 100644
+ }
+ ]
+ },
+
+
+ {
+ "domain": "Network",
+ "description": "Network domain allows tracking network activities of the page. It exposes information about http,\nfile, data and other requests and responses, their headers, bodies, timing, etc.",
Expand Down Expand Up @@ -6794,7 +6769,7 @@ index a0f7fcd..ab1fff9 100644
+ ]
+ }
+ ]
+ },
+ },
+ {
+ "domain": "Log",
+ "description": "Provides access to log entries.",
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# android-v8
Contains the Google's V8 build used in android runtime. The latest branch is [v6.6.346.23](https://github.com/NativeScript/android-v8/tree/darind/6.6.346.23)
Contains the Google's V8 build used in android runtime.

### How to build (linux)

Expand All @@ -19,19 +19,19 @@ sudo apt-get install curl libc6-dev-i386 g++-multilib

Mac OS:
```
curl -O https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip
unzip android-ndk-r16b-darwin-x86_64.zip -d ndkr16b
curl -O https://dl.google.com/android/repository/android-ndk-r17b-darwin-x86_64.zip
unzip android-ndk-r17b-darwin-x86_64.zip -d ndkr17b
```

Linux:
```
curl -O https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip
unzip android-ndk-r16b-linux-x86_64.zip -d ndkr16b
curl -O https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip
unzip android-ndk-r17b-linux-x86_64.zip -d ndkr17b
```

* Export ANDROID_NDK_HOME environment variable
```
export ANDROID_NDK_HOME=`pwd`/ndkr16b/android-ndk-r16b
export ANDROID_NDK_HOME=`pwd`/ndkr17b/android-ndk-r17b
```

* `fetch v8` (this will create a `v8` repo folder)
Expand All @@ -44,9 +44,9 @@ ln -s $ANDROID_NDK_HOME third_party/android_tools/ndk
ln -s $ANDROID_NDK_HOME third_party/android_ndk
```

* checkout tag 6.6.346.23
* checkout tag 6.7.288.46
```
git checkout 6.6.346.23
git checkout 6.7.288.46
```

* Run sync
Expand Down
2 changes: 1 addition & 1 deletion apply_patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

cd v8
git apply --cached ../6.6.346.23.patch
git apply --cached ../6.7.288.46.patch
git checkout .
git commit -m "NativeScript patch"
2 changes: 1 addition & 1 deletion build_v8
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ echo "=================================="
# generate mksnapshot tools
for CURRENT_ARCH in ${ARCH_ARR[@]}
do
ninja -C $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE ${V8_FOLDERS[@]} run_mksnapshot
ninja -C $BUILD_DIR_PREFIX/$CURRENT_ARCH-$BUILD_TYPE ${V8_FOLDERS[@]} run_mksnapshot_default
echo "built snapshot for $CURRENT_ARCH"

DIST="./dist/snapshots/$CURRENT_ARCH-$BUILD_TYPE/"
Expand Down