No longer disable telemetry and fix flutter complaining about local engine host.

1 files changed, 4 insertions, 5 deletions

diff --git a/flutter-engine-prepare.sh b/flutter-engine-prepare.sh
index 0cf2da5f6de6..4b51f7f54eeb 100755
--- a/flutter-engine-prepare.sh
+++ b/flutter-engine-prepare.sh
@@ -9,22 +9,21 @@ git -C "${srcdir}/flutter" checkout -f "$_engine_version"
 
 sed -i 's|"$FLUTTER_ROOT/bin/internal/update_dart_sdk.sh"|#|' 'flutter/bin/internal/shared.sh'
 sed -i -E 's|_wait_for_lock$|#_wait_for_lock|' 'flutter/bin/internal/shared.sh'
+sed -i 's|--no-enable-mirrors "$SCRIPT_PATH"|--no-enable-mirrors "$SCRIPT_PATH" --local-engine=arch_release --local-engine-host=arch_release|' 'flutter/bin/internal/shared.sh'
 rm -rf "${srcdir}/flutter/bin/cache/dart-sdk" || true
 mkdir -p "${srcdir}/flutter/bin/cache"
 _ln "$_dart_sdk" "${srcdir}/flutter/bin/cache/dart-sdk"
 
-(cat << EOF
+install -Dm755 <(cat << EOF
 #!/usr/bin/env sh
 
 $_dart_sdk/bin/dart "\$@"
 EOF
-) > "${srcdir}/flutter/bin/dart"
+) "${srcdir}/flutter/bin/dart"
 
 _ln "$_engine_path/out" "${srcdir}/flutter-engine/out"
 
 export PATH="${srcdir}/flutter/bin:$PATH"
-dart --disable-analytics
-flutter --disable-telemetry
 export FLUTTER_ENGINE="${srcdir}/flutter-engine"
 
-local flutter_select_engine='--local-engine=arch_release'
+local flutter_select_engine='--local-engine=arch_release --local-engine-host=arch_release'