From b56b7affcbe2e5160b043f312023db276c8a988e Mon Sep 17 00:00:00 2001 From: tension <1113989231@qq.com> Date: Mon, 4 Aug 2025 22:10:27 +0800 Subject: [PATCH] Fix buildsystem gen arkconfig circular dependency Issue: ICR2MD Signed-off-by: zhangli <1113989231@qq.com> Change-id: af8cc9f75a812c05d7e61e849b3a78bc1za4e66cd --- ets2panda/driver/build_system/src/build/base_mode.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ets2panda/driver/build_system/src/build/base_mode.ts b/ets2panda/driver/build_system/src/build/base_mode.ts index 578de8289a..f31a72d733 100644 --- a/ets2panda/driver/build_system/src/build/base_mode.ts +++ b/ets2panda/driver/build_system/src/build/base_mode.ts @@ -516,11 +516,16 @@ export abstract class BaseMode { moduleInfo.staticDepModuleInfos = staticDepModules; [...dynamicDepModules.keys(), ...staticDepModules.keys()].forEach(depName => { - moduleInfo.dependenciesSet.add(depName); + if(this.moduleInfos.get(depName)?.language !== '1.1') { + moduleInfo.dependenciesSet.add(depName); + } }); moduleInfo.dependenciesSet.delete(moduleInfo.packageName); moduleInfo.dependencies?.forEach(moduleName => { - this.moduleInfos.get(moduleName)?.dependentSet.add(moduleInfo.packageName); + let depModuleInfo = this.moduleInfos.get(moduleName); + if(depModuleInfo !== undefined && depModuleInfo.language !== '1.1') { + depModuleInfo.dependentSet.add(moduleInfo.packageName); + } }); }); } @@ -565,7 +570,7 @@ export abstract class BaseMode { dependencies: module.dependencies, byteCodeHar: module.byteCodeHar, abcPath: module.abcPath, - dependenciesSet: new Set(module?.dependencies), + dependenciesSet: new Set(), dependentSet: new Set(), }; this.moduleInfos.set(module.packageName, moduleInfo); -- Gitee