Commit engine.realm as empty (flutter#160541)

- only set it when the environment FLUTTER_REALM is present

Author: jtmcdole

.gitignore

@@ -3,7 +3,6 @@
 
 # This is dynamic in a monorepo
 bin/internal/engine.version
-bin/internal/engine.realm
 
 # Miscellaneous
 *.class

bin/internal/engine.realm

@@ -41,25 +41,11 @@ if ((Test-Path "$flutterRoot\DEPS" -PathType Leaf) -and (Test-Path "$flutterRoot
         # The realm on CI is passed in.
         if ($Env:FLUTTER_REALM) {
             [System.IO.File]::WriteAllText("$flutterRoot\bin\internal\engine.realm", $Env:FLUTTER_REALM, $utf8NoBom)
-            $engineRealm = "$Env:FLUTTER_REALM"
         }
-        else {
-            if (Test-Path -Path "$flutterRoot\bin\internal\engine.realm") {
-                $engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
-            }
-        }
-    }
-    else {
-        # Release branch - these files will exist
-        $engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version")
-        $engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
     }
 }
-else {
-    # Non-fusion repository - these files will exist
-    $engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version")
-    $engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
-}
+$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version")
+$engineRealm = (Get-Content "$flutterRoot\bin\internal\engine.realm")
 
 $oldDartSdkPrefix = "dart-sdk.old"
 

bin/internal/update_dart_sdk.ps1

@@ -39,22 +39,11 @@ if [ -f "$FLUTTER_ROOT/DEPS" ] && [ -f "$FLUTTER_ROOT/engine/src/.gn" ]; then
     # The realm on CI is passed in.
     if [ -n "${FLUTTER_REALM}" ]; then
       echo $FLUTTER_REALM > "$FLUTTER_ROOT/bin/internal/engine.realm"
-      ENGINE_REALM="$FLUTTER_REALM"
-    else
-      if [ -f "$FLUTTER_ROOT/bin/internal/engine.realm" ]; then
-        ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
-      fi
     fi
-  else
-    # Release branch - these files will exist
-    ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version")
-    ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
   fi
-else
-  # Non-fusion repository - these files will exist
-  ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version")
-  ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
 fi
+ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version")
+ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]')
 
 if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then
   command -v curl > /dev/null 2>&1 || {