From 0c2e541fa7dc80ba066fb97ab642e61a712a03ea Mon Sep 17 00:00:00 2001 From: li_guoning Date: Wed, 23 Oct 2024 18:20:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?flutter=20build=20hap=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20--target-platform=3Dohox-x64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li_guoning --- .gitignore | 11 +++++++++++ dev/benchmarks/complex_layout/ohos/.gitignore | 8 -------- dev/benchmarks/macrobenchmarks/.gitignore | 9 +++++++++ dev/benchmarks/macrobenchmarks/ohos/.gitignore | 8 -------- packages/flutter_tools/lib/src/build_info.dart | 6 +++--- .../flutter_tools/lib/src/commands/build_app.dart | 2 +- .../flutter_tools/lib/src/commands/build_hap.dart | 2 +- .../flutter_tools/lib/src/commands/build_har.dart | 2 +- .../flutter_tools/lib/src/commands/build_hsp.dart | 2 +- packages/flutter_tools/lib/src/compile.dart | 2 +- packages/flutter_tools/lib/src/ohos/ohos_device.dart | 2 ++ .../templates/app_shared/.gitignore.tmpl | 9 +++++++++ .../templates/app_shared/ohos.tmpl/.gitignore | 8 -------- .../module/ohos/host_app_common/entry.tmpl/.gitignore | 8 -------- .../templates/module/ohos/host_config/.gitignore.tmpl | 9 --------- .../module_library/flutter_module.tmpl/.gitignore | 8 -------- .../flutter_tools/templates/package/.gitignore.tmpl | 9 +++++++++ .../templates/plugin_shared/.gitignore.tmpl | 9 +++++++++ 18 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 8204a87e86..c58e012e51 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 6ca13b3170..0e158c3f26 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 394b6af32c..da298a0ce0 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 6ca13b3170..0e158c3f26 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 4bc6cfb270..f1b853be51 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 7233fe78bf..b5923bfbd9 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 effd903611..4adc519d22 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 b9445beb43..0edbc0fc80 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 6fcaedb72a..9b8137409e 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 8e43ff5680..7a52be8ec7 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 fb82ee253f..14c90a39d2 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 24476c5d1e..2d20242a38 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 6ca13b3170..0e158c3f26 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 63b3805e50..aa3c934840 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 6ca13b3170..b19f8d5b44 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 b418ad664c..36cebc08fe 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 96486fd930..6a0ef06365 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 96486fd930..6a0ef06365 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 -- Gitee From 4f75fca22ba3e294bb4d3273a18f2e12360e7bda Mon Sep 17 00:00:00 2001 From: li_guoning Date: Wed, 23 Oct 2024 18:20:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?flutter=20build=20hap=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20--target-platform=3Dohox-x64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li_guoning --- packages/flutter_tools/lib/src/build_info.dart | 6 +++--- packages/flutter_tools/lib/src/commands/build_app.dart | 2 +- packages/flutter_tools/lib/src/commands/build_hap.dart | 2 +- packages/flutter_tools/lib/src/commands/build_har.dart | 2 +- packages/flutter_tools/lib/src/commands/build_hsp.dart | 2 +- packages/flutter_tools/lib/src/compile.dart | 2 +- packages/flutter_tools/lib/src/ohos/ohos_device.dart | 2 ++ 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart index 4bc6cfb270..f1b853be51 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 7233fe78bf..b5923bfbd9 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 effd903611..4adc519d22 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 b9445beb43..0edbc0fc80 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 6fcaedb72a..9b8137409e 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 8e43ff5680..7a52be8ec7 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 fb82ee253f..14c90a39d2 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; } -- Gitee