Merge branch 'v3.8.5' of github.com:cocos/cocos-engine into v3.8.5_go…

…ogle_play_billing2

# Conflicts:
#	scripts/native-pack-tool/source/index.ts

scripts/native-pack-tool/source/index.ts

@@ -3,7 +3,7 @@ import { MacPackTool } from './platforms/mac';
 import { WindowsPackTool } from './platforms/windows';
 import { AndroidPackTool } from './platforms/android';
 import { GooglePlayPackTool } from './platforms/google-play';
-import { OpenHarmonyPackTool } from './platforms/openharmony';
+import { HarmonyOSNextPackTool } from './platforms/harmonyos-next';
 import { OHOSPackTool } from './platforms/ohos';
 import { IOSPackTool } from './platforms/ios';
 import { HuaweiAGCPackTool } from './platforms/huawei-agc';
@@ -13,7 +13,7 @@ nativePackToolMg.register('mac', new MacPackTool());
 nativePackToolMg.register('windows', new WindowsPackTool());
 nativePackToolMg.register('android', new AndroidPackTool());
 nativePackToolMg.register('google-play', new GooglePlayPackTool());
-nativePackToolMg.register('openharmony', new OpenHarmonyPackTool());
+nativePackToolMg.register('harmonyos-next', new HarmonyOSNextPackTool());
 nativePackToolMg.register('ohos', new OHOSPackTool());
 nativePackToolMg.register('huawei-agc', new HuaweiAGCPackTool());
 

scripts/native-pack-tool/source/platforms/openharmony.ts → scripts/native-pack-tool/source/platforms/harmonyos-next.ts

@@ -24,7 +24,7 @@ export interface OHOSParam {
     apiLevel: number;
 }
 
-export class OpenHarmonyPackTool extends NativePackTool {
+export class HarmonyOSNextPackTool extends NativePackTool {
     params!: CocosParams<OHOSParam>;
 
     initEnv() {