From ddb258d614719ffa3fc956b0cf76b7cd4fa11571 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Tue, 24 Dec 2024 19:44:09 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=88=A0=E9=99=A4libapp.so=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=80=83=E8=99=91arm64=E5=92=8Cx64=E7=9A=84=E5=8C=BA?= =?UTF-8?q?=E5=88=AB?= 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index bd03033053..cfb7d64e2e 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -390,9 +390,13 @@ void cleanAndCopyFlutterAsset( ensureParentExists(desAppSoPath); appSoFile.copySync(desAppSoPath); } else { - final File appSo = globals.fs.file(desAppSoPath); - if (appSo.existsSync()) { - appSo.deleteSync(); + // delete libapp.so + final String dir = globals.fs.path.join(ohosProject.flutterModuleDirectory.path, 'libs'); + final List files = globals.fs.directory(dir).listSync(recursive: true); + for (final FileSystemEntity item in files) { + if (item.basename == APP_SO && item.existsSync()) { + item.deleteSync(); + } } } logger?.printTrace('copy flutter assets to project end'); -- Gitee From 10ad319c56c6d1ad0043d150d215b2628588febf Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Fri, 29 Nov 2024 15:05:49 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0x64=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E4=BA=91=E7=AB=AF=E4=BA=A7=E7=89=A9=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/flutter_cache.dart | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart index 7822ffbe9b..e71d805901 100644 --- a/packages/flutter_tools/lib/src/flutter_cache.dart +++ b/packages/flutter_tools/lib/src/flutter_cache.dart @@ -1021,25 +1021,31 @@ const List> _androidBinaryDirs = >[ const List> _osxBinaryDirsForOhos = >[ ['ohos-arm64-profile/darwin-x64', 'ohos-arm64-profile/darwin-x64.zip'], ['ohos-arm64-release/darwin-x64', 'ohos-arm64-release/darwin-x64.zip'], + ['ohos-x64-profile/darwin-x64', 'ohos-x64-profile/darwin-x64.zip'], + ['ohos-x64-release/darwin-x64', 'ohos-x64-release/darwin-x64.zip'], ]; const List> _linuxBinaryDirsForOhos = >[ ['ohos-arm64-profile/linux-x64', 'ohos-arm64-profile/linux-x64.zip'], ['ohos-arm64-release/linux-x64', 'ohos-arm64-release/linux-x64.zip'], + ['ohos-x64-profile/linux-x64', 'ohos-x64-profile/linux-x64.zip'], + ['ohos-x64-release/linux-x64', 'ohos-x64-release/linux-x64.zip'], ]; const List> _windowsBinaryDirsForOhos = >[ ['ohos-arm64-profile/windows-x64', 'ohos-arm64-profile/windows-x64.zip'], ['ohos-arm64-release/windows-x64', 'ohos-arm64-release/windows-x64.zip'], + ['ohos-x64-profile/windows-x64', 'ohos-x64-profile/windows-x64.zip'], + ['ohos-x64-release/windows-x64', 'ohos-x64-release/windows-x64.zip'], ]; const List> _ohosBinaryDirs = >[ ['ohos-arm64', 'ohos-arm64/artifacts.zip'], ['ohos-arm64-profile', 'ohos-arm64-profile/artifacts.zip'], ['ohos-arm64-release', 'ohos-arm64-release/artifacts.zip'], - // ['ohos-x64', 'ohos-x64/artifacts.zip'], - // ['ohos-x64-profile', 'ohos-x64-profile/artifacts.zip'], - // ['ohos-x64-release', 'ohos-x64-release/artifacts.zip'], + ['ohos-x64', 'ohos-x64/artifacts.zip'], + ['ohos-x64-profile', 'ohos-x64-profile/artifacts.zip'], + ['ohos-x64-release', 'ohos-x64-release/artifacts.zip'], ]; const List> _dartSdks = > [ -- Gitee From 0632a7ad812cd82937d52f5d9ab33a8d226a891b Mon Sep 17 00:00:00 2001 From: songzh Date: Mon, 23 Sep 2024 19:39:19 +0800 Subject: [PATCH 03/10] download dart-sdk from cloud. cherry-pick from 3.22: ab6f9b79949e19bc3540b25b644f33bef6e4e264 Signed-off-by: hezhengyi --- bin/internal/update_dart_sdk.ps1 | 35 +++++++++++++++---- bin/internal/update_dart_sdk.sh | 9 +++-- packages/flutter_tools/lib/src/artifacts.dart | 3 ++ packages/flutter_tools/lib/src/cache.dart | 21 ++++++++--- 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index f4e2e77a55..512f814479 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -19,7 +19,10 @@ $flutterRoot = (Get-Item $progName).parent.parent.FullName $cachePath = "$flutterRoot\bin\cache" $dartSdkPath = "$cachePath\dart-sdk" $engineStamp = "$cachePath\engine-dart-sdk.stamp" -$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version") +$engineVersionFile = "engine.ohos.version" + +$engineVersion = (Get-Content "$flutterRoot\bin\internal\$engineVersionFile") +$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm") $oldDartSdkPrefix = "dart-sdk.old" @@ -38,14 +41,34 @@ if ((Test-Path $engineStamp) -and ($engineVersion -eq (Get-Content $engineStamp) return } -$dartSdkBaseUrl = $Env:FLUTTER_STORAGE_BASE_URL +$dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL if (-not $dartSdkBaseUrl) { - $dartSdkBaseUrl = "https://storage.googleapis.com" + $dartSdkBaseUrl = "https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com" +} +if ($engineRealm) { + $dartSdkBaseUrl = "$dartSdkBaseUrl/$engineRealm" +} +if($Env:FLUTTER_OHOS_STORAGE_BASE_URL) { + $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL +} +# It's important to use the native Dart SDK as the default target architecture +# for Flutter Windows builds depend on the Dart executable's architecture. +$dartZipNameX64 = "dart-sdk-windows-x64.zip" +$dartZipNameArm64 = "dart-sdk-windows-arm64.zip" +$dartZipName = $dartZipNameX64 +if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { + $dartSdkArm64Url = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipNameArm64" + Try { + Invoke-WebRequest -Uri $dartSdkArm64Url -UseBasicParsing -Method Head | Out-Null + $dartZipName = $dartZipNameArm64 + } + Catch { + Write-Host "The current channel's Dart SDK does not support Windows Arm64, falling back to Windows x64..." + } } -$dartZipName = "dart-sdk-windows-x64.zip" $dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName" - -if (Test-Path $dartSdkPath) { +Write-Host "dart-sdk-url: $dartSdkUrl" +if ((Test-Path $dartSdkPath) -or (Test-Path $dartSdkLicense)) { # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ). $oldDartSdkSuffix = 1 while (Test-Path "$cachePath\$oldDartSdkPrefix$oldDartSdkSuffix") { $oldDartSdkSuffix++ } diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 49e4698a82..4ed2e2a3fc 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -16,10 +16,14 @@ set -e FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")" +ENGINE_VERSION_FILE="engine.ohos.version" +FLUTTER_OHOS_STORAGE_BASE_URL=${FLUTTER_OHOS_STORAGE_BASE_URL:-https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com} + DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" -ENGINE_VERSION=`cat "$FLUTTER_ROOT/bin/internal/engine.version"` +ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/$ENGINE_VERSION_FILE") +ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]') OS="$(uname -s)" if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then @@ -121,9 +125,10 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t FIND=find fi - DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}" + DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL}${ENGINE_REALM:+/$ENGINE_REALM}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" + echo 'dart-sdk-url:' $DART_SDK_URL # if the sdk path exists, copy it to a temporary location if [ -d "$DART_SDK_PATH" ]; then rm -rf "$DART_SDK_PATH_OLD" diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index c99e24cd5f..78e827ae3f 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -646,6 +646,9 @@ class CachedArtifacts implements Artifacts { assert(platform != null); switch (artifact) { case Artifact.genSnapshot: + if (platform == TargetPlatform.ohos_arm64) { + return _getAndroidArtifactPath(artifact, TargetPlatform.ohos_arm64, mode!); + } // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for // android_arm in profile mode because it is available on all supported host platforms. return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile); diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 0102b3ea08..7f5e804a34 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -22,6 +22,7 @@ import 'base/user_messages.dart'; import 'build_info.dart'; import 'convert.dart'; import 'features.dart'; +import 'globals.dart'; const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) @@ -893,6 +894,7 @@ abstract class EngineCachedArtifact extends CachedArtifact { List getPackageDirs(); String get storageBaseUrl => cache.storageBaseUrl; + String get ohosStorageBaseUrl => cache.ohosStorageBaseUrl; @override bool isUpToDateInner(FileSystem fileSystem) { @@ -927,21 +929,30 @@ abstract class EngineCachedArtifact extends CachedArtifact { OperatingSystemUtils operatingSystemUtils, ) async { final String url = '$storageBaseUrl/flutter_infra_release/flutter/$version/'; - + final String ohosEngineVersion = cache.getVersionFor('engine.ohos')!; + // New platform Ohos is supported, so flutter needs to download + // sky_engine.zip, flutter_patched_sdk.zip and flutter_patched_sdk_product.zip from ohos URL + final String ohosUrl = '$ohosStorageBaseUrl/flutter_infra_release/flutter/$ohosEngineVersion/'; final Directory pkgDir = cache.getCacheDir('pkg'); for (final String pkgName in getPackageDirs()) { - await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$url$pkgName.zip'), pkgDir); + if (pkgName == 'sky_engine') { + await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$ohosUrl$pkgName.zip'), pkgDir); + } else { + await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$url$pkgName.zip'), pkgDir); + } } for (final List toolsDir in getBinaryDirs()) { final String cacheDir = toolsDir[0]; final String urlPath = toolsDir[1]; final Directory dir = fileSystem.directory(fileSystem.path.join(location.path, cacheDir)); - // Avoid printing things like 'Downloading linux-x64 tools...' multiple times. final String friendlyName = urlPath.replaceAll('/artifacts.zip', '').replaceAll('.zip', ''); - await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(url + urlPath), dir); - + if (urlPath.startsWith('flutter_patched_sdk')) { + await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(ohosUrl + urlPath), dir); + } else { + await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(url + urlPath), dir); + } _makeFilesExecutable(dir, operatingSystemUtils); final File frameworkZip = fileSystem.file(fileSystem.path.join(dir.path, 'FlutterMacOS.framework.zip')); -- Gitee From 5ca5d11652cfbbb406a765ab9120512808cb7aab Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 26 Dec 2024 19:35:00 +0800 Subject: [PATCH 04/10] Update engine.ohos.vertion to d2180af3 Signed-off-by: hezhengyi --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index bc98d0949e..0fb8b47c59 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -804c70a21f2a284868eb88f4bb7f22bc280a39cb +d2180af3058b7c48a6ddcf8ab7eee51a5382d556 -- Gitee From 05cc515a7763a17a01aa4093b8a8980d66ecd477 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 26 Dec 2024 19:58:25 +0800 Subject: [PATCH 05/10] add engine.realm Signed-off-by: hezhengyi --- bin/internal/engine.realm | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 bin/internal/engine.realm diff --git a/bin/internal/engine.realm b/bin/internal/engine.realm new file mode 100644 index 0000000000..e69de29bb2 -- Gitee From 24149aa7c77849599041752f57e696467c406573 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Thu, 26 Dec 2024 20:07:19 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=A0=E9=99=A43.7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- bin/internal/update_dart_sdk.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index 512f814479..b5c8d5940e 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -68,7 +68,7 @@ if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { } $dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName" Write-Host "dart-sdk-url: $dartSdkUrl" -if ((Test-Path $dartSdkPath) -or (Test-Path $dartSdkLicense)) { +if (Test-Path $dartSdkPath) { # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ). $oldDartSdkSuffix = 1 while (Test-Path "$cachePath\$oldDartSdkPrefix$oldDartSdkSuffix") { $oldDartSdkSuffix++ } -- Gitee From 2836d0a6c6776e9025bc9421134bacde56bb9345 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 28 Dec 2024 12:06:52 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=88=A4=E6=96=ADlibs=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8E=E5=86=8D=E6=89=A7=E8=A1=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4libapp.so=E7=9A=84=E6=93=8D=E4=BD=9C?= 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index cfb7d64e2e..99e0560836 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -392,10 +392,13 @@ void cleanAndCopyFlutterAsset( } else { // delete libapp.so final String dir = globals.fs.path.join(ohosProject.flutterModuleDirectory.path, 'libs'); - final List files = globals.fs.directory(dir).listSync(recursive: true); - for (final FileSystemEntity item in files) { - if (item.basename == APP_SO && item.existsSync()) { - item.deleteSync(); + if (globals.fs.directory(dir).existsSync()) { + final List files = globals.fs.directory(dir) + .listSync(recursive: true); + for (final FileSystemEntity item in files) { + if (item.basename == APP_SO && item.existsSync()) { + item.deleteSync(); + } } } } -- Gitee From 35300e2062fa2ae513d0944d7ffd6275e5f2ab3e Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 28 Dec 2024 12:07:38 +0800 Subject: [PATCH 08/10] Update engine.ohos.version to 22e6beb9 Signed-off-by: hezhengyi --- bin/internal/engine.ohos.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index 0fb8b47c59..ed63886244 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -d2180af3058b7c48a6ddcf8ab7eee51a5382d556 +22e6beb953c7b5b1446d5a00eeba78c5d996c5c2 -- Gitee From b886fcaa5759ef7ea5683afd75296dbe7e97e855 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 30 Dec 2024 09:42:10 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=AF=8F=E6=AC=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8Cflutter=E5=91=BD=E4=BB=A4=E6=97=B6=E9=83=BD?= =?UTF-8?q?=E6=8F=90=E7=A4=BADownloading=20Dart=20SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- bin/internal/shared.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/shared.bat b/bin/internal/shared.bat index 26fea94219..8f1e38b0e1 100644 --- a/bin/internal/shared.bat +++ b/bin/internal/shared.bat @@ -21,7 +21,7 @@ SET stamp_path=%cache_dir%\flutter_tools.stamp SET script_path=%flutter_tools_dir%\bin\flutter_tools.dart SET dart_sdk_path=%cache_dir%\dart-sdk SET engine_stamp=%cache_dir%\engine-dart-sdk.stamp -SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.version +SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.ohos.version SET pub_cache_path=%FLUTTER_ROOT%\.pub-cache SET dart=%dart_sdk_path%\bin\dart.exe -- Gitee From 8e541111adc1e19e2df131acf0596a491b6fe5f4 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 30 Dec 2024 11:35:13 +0800 Subject: [PATCH 10/10] delete engine.realm Signed-off-by: hezhengyi --- bin/internal/engine.realm | 0 bin/internal/update_dart_sdk.ps1 | 4 ---- bin/internal/update_dart_sdk.sh | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 bin/internal/engine.realm diff --git a/bin/internal/engine.realm b/bin/internal/engine.realm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index b5c8d5940e..ebca4a4b02 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -22,7 +22,6 @@ $engineStamp = "$cachePath\engine-dart-sdk.stamp" $engineVersionFile = "engine.ohos.version" $engineVersion = (Get-Content "$flutterRoot\bin\internal\$engineVersionFile") -$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm") $oldDartSdkPrefix = "dart-sdk.old" @@ -45,9 +44,6 @@ $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL if (-not $dartSdkBaseUrl) { $dartSdkBaseUrl = "https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com" } -if ($engineRealm) { - $dartSdkBaseUrl = "$dartSdkBaseUrl/$engineRealm" -} if($Env:FLUTTER_OHOS_STORAGE_BASE_URL) { $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL } diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 4ed2e2a3fc..2224a8f9e1 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -23,7 +23,6 @@ DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/$ENGINE_VERSION_FILE") -ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]') OS="$(uname -s)" if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then @@ -125,7 +124,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t FIND=find fi - DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL}${ENGINE_REALM:+/$ENGINE_REALM}" + DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL:-https://storage.googleapis.com}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" echo 'dart-sdk-url:' $DART_SDK_URL -- Gitee