diff --git a/.gitignore b/.gitignore
index 8204a87e86d105df34e0b9db803ad0c57bf337f0..c58e012e5138d96fa677afd4c26dbba302abc7fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,17 @@ unlinked_spec.ds
 **/macos/Flutter/ephemeral
 **/xcuserdata/
 
+# ohos 
+**/ohos/**/*.har
+**/ohos/**/BuildProfile.ets
+**/ohos/**/oh-package-lock.json5
+**/ohos/**/GeneratedPluginRegistrant.ets
+
+**/ohos/**/resources/rawfile/flutter_assets/
+**/ohos/**/libapp.so
+**/ohos/**/libflutter.so
+**/ohos/**/libvmservice_snapshot.so
+
 # Windows
 **/windows/flutter/generated_plugin_registrant.cc
 **/windows/flutter/generated_plugin_registrant.h
diff --git a/dev/benchmarks/complex_layout/ohos/.gitignore b/dev/benchmarks/complex_layout/ohos/.gitignore
index 6ca13b3170eec5dd5ac5ad7f1c4dd0118845f473..0e158c3f26319059b259982c0f05f4537e86b13f 100644
--- a/dev/benchmarks/complex_layout/ohos/.gitignore
+++ b/dev/benchmarks/complex_layout/ohos/.gitignore
@@ -9,11 +9,3 @@
 /.clang-format
 /.clang-tidy
 **/.test
-*.har
-**/BuildProfile.ets
-**/oh-package-lock.json5
-
-**/src/main/resources/rawfile/flutter_assets/
-**/libs/arm64-v8a/libapp.so
-**/libs/arm64-v8a/libflutter.so
-**/libs/arm64-v8a/libvmservice_snapshot.so
diff --git a/dev/benchmarks/macrobenchmarks/.gitignore b/dev/benchmarks/macrobenchmarks/.gitignore
index 394b6af32c5a2648246ed637159fac6b489382c2..da298a0ce08d86f2ae9a413ac0dc1f0f91396597 100644
--- a/dev/benchmarks/macrobenchmarks/.gitignore
+++ b/dev/benchmarks/macrobenchmarks/.gitignore
@@ -2,3 +2,12 @@ lib/generated_plugin_registrant.dart
 devtools_memory.json
 *.sksl.json
 vmservice.out
+
+ohos/**/*.har
+ohos/**/BuildProfile.ets
+ohos/**/oh-package-lock.json5
+
+ohos/**/resources/rawfile/flutter_assets/
+ohos/**/libapp.so
+ohos/**/libflutter.so
+ohos/**/libvmservice_snapshot.so
\ No newline at end of file
diff --git a/dev/benchmarks/macrobenchmarks/ohos/.gitignore b/dev/benchmarks/macrobenchmarks/ohos/.gitignore
index 6ca13b3170eec5dd5ac5ad7f1c4dd0118845f473..0e158c3f26319059b259982c0f05f4537e86b13f 100644
--- a/dev/benchmarks/macrobenchmarks/ohos/.gitignore
+++ b/dev/benchmarks/macrobenchmarks/ohos/.gitignore
@@ -9,11 +9,3 @@
 /.clang-format
 /.clang-tidy
 **/.test
-*.har
-**/BuildProfile.ets
-**/oh-package-lock.json5
-
-**/src/main/resources/rawfile/flutter_assets/
-**/libs/arm64-v8a/libapp.so
-**/libs/arm64-v8a/libflutter.so
-**/libs/arm64-v8a/libvmservice_snapshot.so
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 <String>['ohos-arm64'],
-      allowed: <String>['ohos-arm64', 'ohos-arm', 'ohos-x86'],
+      allowed: <String>['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 <String>['ohos-arm64'],
-      allowed: <String>['ohos-arm64', 'ohos-arm', 'ohos-x86'],
+      allowed: <String>['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 <String>['ohos-arm64'],
-      allowed: <String>['ohos-arm64', 'ohos-arm', 'ohos-x86'],
+      allowed: <String>['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 <String>['ohos-arm64'],
-      allowed: <String>['ohos-arm64', 'ohos-arm', 'ohos-x86'],
+      allowed: <String>['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..7a52be8ec791ffd97a56a80ca6fb166b3c617843 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) {
       final Artifacts? artifacts = globals.artifacts;
       if (artifacts is LocalEngineArtifacts) {
         final LocalEngineArtifacts localEngineArtifacts = artifacts;
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;
     }
diff --git a/packages/flutter_tools/templates/app_shared/.gitignore.tmpl b/packages/flutter_tools/templates/app_shared/.gitignore.tmpl
index 24476c5d1eb55824c76d8b01a3965f94abad1ef8..2d20242a38b1d57d6c7358eb01e6879c29674b90 100644
--- a/packages/flutter_tools/templates/app_shared/.gitignore.tmpl
+++ b/packages/flutter_tools/templates/app_shared/.gitignore.tmpl
@@ -42,3 +42,12 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+ohos/**/*.har
+ohos/**/BuildProfile.ets
+ohos/**/oh-package-lock.json5
+
+ohos/**/resources/rawfile/flutter_assets/
+ohos/**/libapp.so
+ohos/**/libflutter.so
+ohos/**/libvmservice_snapshot.so
\ No newline at end of file
diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/.gitignore b/packages/flutter_tools/templates/app_shared/ohos.tmpl/.gitignore
index 6ca13b3170eec5dd5ac5ad7f1c4dd0118845f473..0e158c3f26319059b259982c0f05f4537e86b13f 100644
--- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/.gitignore
+++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/.gitignore
@@ -9,11 +9,3 @@
 /.clang-format
 /.clang-tidy
 **/.test
-*.har
-**/BuildProfile.ets
-**/oh-package-lock.json5
-
-**/src/main/resources/rawfile/flutter_assets/
-**/libs/arm64-v8a/libapp.so
-**/libs/arm64-v8a/libflutter.so
-**/libs/arm64-v8a/libvmservice_snapshot.so
diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/.gitignore b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/.gitignore
index 63b3805e505c52aee356e1adcefd93efb5b17eeb..aa3c93484077995b1c35324c05023ad45fd7f227 100644
--- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/.gitignore
+++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/.gitignore
@@ -5,11 +5,3 @@
 /build
 /.cxx
 /.test
-*.har
-**/BuildProfile.ets
-**/oh-package-lock.json5
-
-**/src/main/resources/rawfile/flutter_assets/
-**/libs/arm64-v8a/libapp.so
-**/libs/arm64-v8a/libflutter.so
-**/libs/arm64-v8a/libvmservice_snapshot.so
\ No newline at end of file
diff --git a/packages/flutter_tools/templates/module/ohos/host_config/.gitignore.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/.gitignore.tmpl
index 6ca13b3170eec5dd5ac5ad7f1c4dd0118845f473..b19f8d5b4409d520abb25867f6734ca1930dcaf7 100644
--- a/packages/flutter_tools/templates/module/ohos/host_config/.gitignore.tmpl
+++ b/packages/flutter_tools/templates/module/ohos/host_config/.gitignore.tmpl
@@ -8,12 +8,3 @@
 /.clangd
 /.clang-format
 /.clang-tidy
-**/.test
-*.har
-**/BuildProfile.ets
-**/oh-package-lock.json5
-
-**/src/main/resources/rawfile/flutter_assets/
-**/libs/arm64-v8a/libapp.so
-**/libs/arm64-v8a/libflutter.so
-**/libs/arm64-v8a/libvmservice_snapshot.so
diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/.gitignore b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/.gitignore
index b418ad664cfaf1d214d7470954d3c1d398434295..36cebc08fed900e5cecb39b110736acf00dd5598 100644
--- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/.gitignore
+++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/.gitignore
@@ -4,11 +4,3 @@
 /build
 /.cxx
 /.test
-*.har
-**/BuildProfile.ets
-**/oh-package-lock.json5
-
-**/src/main/resources/rawfile/flutter_assets/
-**/libs/arm64-v8a/libapp.so
-**/libs/arm64-v8a/libflutter.so
-**/libs/arm64-v8a/libvmservice_snapshot.so
\ No newline at end of file
diff --git a/packages/flutter_tools/templates/package/.gitignore.tmpl b/packages/flutter_tools/templates/package/.gitignore.tmpl
index 96486fd9302436d1f5334df3e5240c1ea252e7e9..6a0ef06365611fa64a2a67628c8850a0741f7958 100644
--- a/packages/flutter_tools/templates/package/.gitignore.tmpl
+++ b/packages/flutter_tools/templates/package/.gitignore.tmpl
@@ -28,3 +28,12 @@ migrate_working_dir/
 .dart_tool/
 .packages
 build/
+
+ohos/**/*.har
+ohos/**/BuildProfile.ets
+ohos/**/oh-package-lock.json5
+
+ohos/**/resources/rawfile/flutter_assets/
+ohos/**/libapp.so
+ohos/**/libflutter.so
+ohos/**/libvmservice_snapshot.so
\ No newline at end of file
diff --git a/packages/flutter_tools/templates/plugin_shared/.gitignore.tmpl b/packages/flutter_tools/templates/plugin_shared/.gitignore.tmpl
index 96486fd9302436d1f5334df3e5240c1ea252e7e9..6a0ef06365611fa64a2a67628c8850a0741f7958 100644
--- a/packages/flutter_tools/templates/plugin_shared/.gitignore.tmpl
+++ b/packages/flutter_tools/templates/plugin_shared/.gitignore.tmpl
@@ -28,3 +28,12 @@ migrate_working_dir/
 .dart_tool/
 .packages
 build/
+
+ohos/**/*.har
+ohos/**/BuildProfile.ets
+ohos/**/oh-package-lock.json5
+
+ohos/**/resources/rawfile/flutter_assets/
+ohos/**/libapp.so
+ohos/**/libflutter.so
+ohos/**/libvmservice_snapshot.so
\ No newline at end of file