Merge branch 'main' into feature/update-vue-docs

Tencent · Sep 6, 2023 · cdbea2f · cdbea2f
2 parents ed0c225 + 890400a
commit cdbea2f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/driver/js/src/vm/v8/v8_vm.cc b/driver/js/src/vm/v8/v8_vm.cc
@@ -88,6 +88,10 @@ V8VM::V8VM(const std::shared_ptr<V8VMInitParam>& param) : VM(param) {
 #endif
       FOOTSTONE_DLOG(INFO) << "Initialize";
       v8::V8::Initialize();
+#ifdef ENABLE_INSPECTOR
+      auto trace = reinterpret_cast<v8::platform::tracing::TracingController*>(platform->GetTracingController());
+      devtools::DevtoolsDataSource::OnGlobalTracingControlGenerate(trace);
+#endif    
     }
   }
   create_params_.array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();

diff --git a/framework/android/build.gradle b/framework/android/build.gradle
@@ -123,6 +123,7 @@ android {
                     arguments (
                             "-DCMAKE_BUILD_TYPE=Debug",
                             "-DMODULES=${getAllModules().join(';')}",
+                            "-DENABLE_INSPECTOR=$ENABLE_INSPECTOR",
                             *mergeCppDefinitions()
                     )
 

diff --git a/framework/android/gradle.properties b/framework/android/gradle.properties
@@ -116,3 +116,8 @@ PUBLISH_ARTIFACT_ID=release
 # Specifies maven publish group ID
 #
 PUBLISH_GROUP_ID=com.tencent.hippy
+
+#
+# Specifies DEVTOOL INSPECTOR OPEN OR NOT
+#
+ENABLE_INSPECTOR=true