diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart index 4bc6cfb270e438f43fb4ecbff08ac75cd5bc575f..f1b853be51bd9c011d5800e4844f20c2d70aade5 100644 --- a/packages/flutter_tools/lib/src/build_info.dart +++ b/packages/flutter_tools/lib/src/build_info.dart @@ -828,7 +828,7 @@ String getNameForTargetPlatform(TargetPlatform platform, {DarwinArch? darwinArch case TargetPlatform.ohos_arm64: return 'ohos-arm64'; case TargetPlatform.ohos_x64: - return 'ohos-x86'; + return 'ohos-x64'; } } @@ -922,7 +922,7 @@ OhosArch getOhosArchForName(String platform) { return OhosArch.armeabi_v7a; case 'ohos-arm64': return OhosArch.arm64_v8a; - case 'ohos-x86': + case 'ohos-x64': return OhosArch.x86_64; } throw Exception('Unsupported Ohos arch name "$platform"'); @@ -946,7 +946,7 @@ String getPlatformNameForOhosArch(OhosArch arch) { case OhosArch.arm64_v8a: return 'ohos-arm64'; case OhosArch.x86_64: - return 'ohos-x86'; + return 'ohos-x64'; } } diff --git a/packages/flutter_tools/lib/src/commands/build_app.dart b/packages/flutter_tools/lib/src/commands/build_app.dart index 7233fe78bf991821fcf6de0eecadbd1fe50cfb5b..b5923bfbd9d998f49383c80fd4f2107e558aeb52 100644 --- a/packages/flutter_tools/lib/src/commands/build_app.dart +++ b/packages/flutter_tools/lib/src/commands/build_app.dart @@ -47,7 +47,7 @@ class BuildAppCommand extends BuildSubCommand { argParser.addMultiOption( 'target-platform', defaultsTo: const ['ohos-arm64'], - allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x86'], + allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x64'], help: 'The target platform for which the app is compiled.', ); } diff --git a/packages/flutter_tools/lib/src/commands/build_hap.dart b/packages/flutter_tools/lib/src/commands/build_hap.dart index effd90361169e8f7c96e4ef2ac1f4b5262e2d400..4adc519d22b0cbd371841d21c5aa3f2733685af8 100644 --- a/packages/flutter_tools/lib/src/commands/build_hap.dart +++ b/packages/flutter_tools/lib/src/commands/build_hap.dart @@ -47,7 +47,7 @@ class BuildHapCommand extends BuildSubCommand { argParser.addMultiOption( 'target-platform', defaultsTo: const ['ohos-arm64'], - allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x86'], + allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x64'], help: 'The target platform for which the app is compiled.', ); } diff --git a/packages/flutter_tools/lib/src/commands/build_har.dart b/packages/flutter_tools/lib/src/commands/build_har.dart index b9445beb43f1588c3d31c12763f08ce5a4bcd461..0edbc0fc80ca32e95bbd963eee5101241417d1cd 100644 --- a/packages/flutter_tools/lib/src/commands/build_har.dart +++ b/packages/flutter_tools/lib/src/commands/build_har.dart @@ -45,7 +45,7 @@ class BuildHarCommand extends BuildSubCommand { argParser.addMultiOption( 'target-platform', defaultsTo: const ['ohos-arm64'], - allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x86'], + allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x64'], help: 'The target platform for which the app is compiled.', ); } diff --git a/packages/flutter_tools/lib/src/commands/build_hsp.dart b/packages/flutter_tools/lib/src/commands/build_hsp.dart index 6fcaedb72a9546f8b31731c98ab92e4700a3dd23..9b8137409e3ebe3a875ed5d5340fe6a7787b0e5d 100644 --- a/packages/flutter_tools/lib/src/commands/build_hsp.dart +++ b/packages/flutter_tools/lib/src/commands/build_hsp.dart @@ -47,7 +47,7 @@ class BuildHspCommand extends BuildSubCommand { argParser.addMultiOption( 'target-platform', defaultsTo: const ['ohos-arm64'], - allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x86'], + allowed: ['ohos-arm64', 'ohos-arm', 'ohos-x64'], help: 'The target platform for which the app is compiled.', ); } diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index 8e43ff5680def95af3f7bdc924b7048258b85a4c..c322639bb5de5a091db6f832a49fada47c121a60 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart @@ -285,7 +285,7 @@ class KernelCompiler { toMultiRootPath(dartPluginRegistrantFileUri, _fileSystemScheme, _fileSystemRoots, _fileSystem.path.separator == r'\'); } String? engineDartBinary; - if (globals.os.hostPlatform == HostPlatform.darwin_arm64) { + if (globals.platform.isMacOS || globals.platform.isLinux) { final Artifacts? artifacts = globals.artifacts; if (artifacts is LocalEngineArtifacts) { final LocalEngineArtifacts localEngineArtifacts = artifacts; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index 4ac5107ae4895b8b14a196c32ba541fd83f5464b..bd03033053e012aae22c1a453be639fc332e6d2d 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -327,7 +327,7 @@ Future flutterAssemble(FlutterProject flutterProject, defines: { ...ohosBuildInfo.buildInfo.toBuildSystemEnvironment(), kTargetFile: targetFile, - kTargetPlatform: getNameForTargetPlatform(TargetPlatform.ohos), + kTargetPlatform: getPlatformNameForOhosArch(ohosBuildInfo.targetArchs.first), }, artifacts: globals.artifacts!, fileSystem: globals.fs, diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device.dart b/packages/flutter_tools/lib/src/ohos/ohos_device.dart index fb82ee253fd9540b483670bef48dc6efe2af17ba..14c90a39d2fd523284a79d4dae34f360dfa653b4 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device.dart @@ -424,6 +424,8 @@ class OhosDevice extends Device { return TargetPlatform.ohos_arm64; } else if (abilist.contains('x64')) { return TargetPlatform.ohos_x64; + } else if (abilist.contains('x86_64')) { + return TargetPlatform.ohos_x64; } else { return TargetPlatform.ohos_arm64; }