From 5be4f4e6b0467b2f6b1f812a6ed70a905ad61bd5 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Fri, 29 Dec 2023 15:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BC=96=E8=AF=91=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=97=B6=E6=B8=85=E9=99=A4har=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/ohos/hvigor.dart | 4 +--- packages/flutter_tools/lib/src/ohos/ohos_device.dart | 4 ++-- packages/flutter_tools/lib/src/project.dart | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index b3ba711c9a..13426e091e 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -540,9 +540,7 @@ void cleanAndCopyFlutterRuntime( } ensureParentExists(desHarPath); final File originHarFile = globals.localFileSystem.file(originHarPath); - if (!globals.localFileSystem.file(desHarPath).existsSync()) { - originHarFile.copySync(desHarPath); - } + originHarFile.copySync(desHarPath); //copy ohos engine so final String? originEngineSoPath = isWindows diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device.dart b/packages/flutter_tools/lib/src/ohos/ohos_device.dart index 687b65032c..b850cf21c2 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device.dart @@ -431,13 +431,13 @@ class OhosDevice extends Device { // const.product.cpu.abilist = arm64-v8a final String? abilist = await _getProperty('const.product.cpu.abilist'); if (abilist == null) { - return TargetPlatform.ohos_arm; + return TargetPlatform.ohos_arm64; } else if (abilist.contains('arm64-v8a')) { return TargetPlatform.ohos_arm64; } else if (abilist.contains('x64')) { return TargetPlatform.ohos_x64; } else { - return TargetPlatform.ohos_arm; + return TargetPlatform.ohos_arm64; } }(); diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 7365689b58..931058032e 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart @@ -921,9 +921,11 @@ class OhosProject extends FlutterProjectPlatform { List get ohModulesCacheDirectorys { const String OH_MODULES_NAME = 'oh_modules'; - return moduleDirectorys + final List list = moduleDirectorys .map((Directory e) => e.childDirectory(OH_MODULES_NAME)) .toList(); + list.add(ohosRoot.childDirectory(OH_MODULES_NAME)); + return list; } /// 删除ohModules文件夹缓存 -- Gitee