From 23f9f49662e5ddf8726f8b68a05daeb838c3d9da Mon Sep 17 00:00:00 2001
From: Gary Qian <garyq@google.com>
Date: Fri, 3 Dec 2021 00:37:17 -0800
Subject: [PATCH] Fix platform env variable not registering with sdk_manager
 (flutter/engine#30107)

---
 DEPS                                                          | 2 +-
 .../src/flutter/tools/android_sdk/create_sdk_cipd_packages.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DEPS b/DEPS
index e38d6235ba..e5b7f686a4 100644
--- a/DEPS
+++ b/DEPS
@@ -504,7 +504,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/sdk/all/${{platform}}',
-        'version': 'version:31v2'
+        'version': 'version:31v5'
        }
      ],
      'condition': 'download_android_deps',
diff --git a/engine/src/flutter/tools/android_sdk/create_sdk_cipd_packages.sh b/engine/src/flutter/tools/android_sdk/create_sdk_cipd_packages.sh
index ac0dd72bc6..a645f2cf05 100644
--- a/engine/src/flutter/tools/android_sdk/create_sdk_cipd_packages.sh
+++ b/engine/src/flutter/tools/android_sdk/create_sdk_cipd_packages.sh
@@ -80,13 +80,15 @@ for platform in "${platforms[@]}"; do
   echo "Creating temporary working directory for $platform: $sdk_root"
   mkdir $sdk_root
   mkdir $upload_dir
+  export REPO_OS_OVERRIDE=$platform
 
   # Download all the packages with sdkmanager.
   for package in $(cat $package_file_name); do
     echo $package
     split=(${package//:/ })
     echo "Installing ${split[0]}"
-    REPO_OS_OVERRIDE=$platform yes "y" | $sdkmanager_path --sdk_root=$sdk_root ${split[0]}
+    yes "y" | $sdkmanager_path --sdk_root=$sdk_root ${split[0]}
+
     # We copy only the relevant directories to a temporary dir
     # for upload. sdkmanager creates extra files that we don't need.
     array_length=${#split[@]}