Merge pull request #372 from cocos/v3.8.0

V3.8.0

android/CMakeLists.txt

@@ -84,8 +84,7 @@ if(USE_SE_V8)
       IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a
       INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
     )
-    set(se_libs_name v8_monolith)
-    set(se_libs_include ${platform_spec_path}/include/v8)
+    set(se_libs_name v8_monolith v8_inspector)
 endif()
 
 if(USE_WEBSOCKET_SERVER)
@@ -161,9 +160,7 @@ endif()
 
 set(ZLIB z)
 if(NOT USE_MODULES)
-  list(APPEND CC_EXTERNAL_LIBS ${ZLIB} 
-   ${se_libs_name}
-   )
+  list(APPEND CC_EXTERNAL_LIBS ${ZLIB}  ${se_libs_name})
 endif()
 
 

emscripten/spine/spine.d.ts

@@ -6,6 +6,10 @@ declare module 'external:emscripten/spine/spine.wasm.js' {
     export default SpineWasm;
 }
 
+declare module 'external:emscripten/spine/spine.wasm.fallback.js' {
+    export default SpineWasm;
+}
+
 // tslint:disable
 declare function SpineWasm (moduleOptions?: any): Promise<void>;
 

sources/CMakeLists.txt

@@ -54,7 +54,7 @@ add_definitions(-DCC_SWAPPY_ENABLED)
 endif()
 
 
-if(ANDROID AND (NOT SURFACE_LESS_SERVICE))
+if(ANDROID)
     set(CC_GAME_ACTIVITY_SOURCES
         ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
         ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/system_utils.cpp