Skip to content
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
2 changes: 1 addition & 1 deletion Core/AppRuntime/V8Inspector/Include/V8Inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef V8_31BIT_SMIS_ON_64BIT_ARCH
#define V8_31BIT_SMIS_ON_64BIT_ARCH 1
#endif
#ifndef V8_ENABLE_SANDBOX
#if !defined(ANDROID) && !defined(V8_ENABLE_SANDBOX)
#define V8_ENABLE_SANDBOX 1
#endif
#endif
Expand Down
9 changes: 1 addition & 8 deletions Core/AppRuntime/V8Inspector/Source/V8InspectorAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,7 @@ namespace Babylon

void ConnectFrontend()
{
session_ = inspector_->connect(
1, new ChannelImpl(agent_), v8_inspector::StringView()
// v8-android package and v8 nuget do not share the same V8 version. A change in V8_inspector API forces us to add this
// ifndef check. This will be fixed in a future nuget package update.
#ifndef ANDROID
, v8_inspector::V8Inspector::kFullyTrusted
#endif
);
session_ = inspector_->connect(1, new ChannelImpl(agent_), v8_inspector::StringView(), v8_inspector::V8Inspector::kFullyTrusted);
}

void DisconnectFrontend()
Expand Down
5 changes: 3 additions & 2 deletions Core/Node-API/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ if(NAPI_BUILD_ABI)
"Source/js_native_api_v8_internals.h")

if(ANDROID)
set(V8_PACKAGE_NAME "v8-android-jit-nointl-nosnapshot")
set(V8_ANDROID_DIR "${CMAKE_CURRENT_BINARY_DIR}/${V8_PACKAGE_NAME}")
set(V8_PACKAGE_BASE_NAME "v8-android-jit-nointl-nosnapshot")
set(V8_PACKAGE_NAME "@babylonjs/${V8_PACKAGE_BASE_NAME}")
set(V8_ANDROID_DIR "${CMAKE_CURRENT_BINARY_DIR}/${V8_PACKAGE_BASE_NAME}")
napi_install_android_package(v8 "dist/org/chromium" ${V8_ANDROID_DIR})

set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES}
Expand Down
2 changes: 1 addition & 1 deletion Core/Node-API/Include/Engine/V8/napi/env.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef V8_31BIT_SMIS_ON_64BIT_ARCH
#define V8_31BIT_SMIS_ON_64BIT_ARCH 1
#endif
#ifndef V8_ENABLE_SANDBOX
#if !defined(ANDROID) && !defined(V8_ENABLE_SANDBOX)
#define V8_ENABLE_SANDBOX 1
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion Core/Node-API/Source/js_native_api_v8_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifndef V8_31BIT_SMIS_ON_64BIT_ARCH
#define V8_31BIT_SMIS_ON_64BIT_ARCH 1
#endif
#ifndef V8_ENABLE_SANDBOX
#if !defined(ANDROID) && !defined(V8_ENABLE_SANDBOX)
#define V8_ENABLE_SANDBOX 1
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion Core/Node-API/package-v8.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"v8-android-jit-nointl-nosnapshot": "11.1000.4"
"@babylonjs/v8-android-jit-nointl-nosnapshot": "11.110.1"
}
}