FLUXUI-34161 [AppleTV] Migrate Flutter from 3.0.5 to 3.3.0 version Ap…

…pleTV
LibertyGlobal · Jul 7, 2023 · 5d25482 · 5d25482
1 parent f24f62f
commit 5d25482
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build/config/ios/ios_sdk.gni b/build/config/ios/ios_sdk.gni
@@ -16,7 +16,7 @@ declare_args() {
   use_ios_simulator = true
 
   # Version of iOS that we're targeting.
-  ios_deployment_target = "11.0"
+  ios_deployment_target = "12.0"
 
   # The path to the iOS device SDK.
   ios_device_sdk_path = ""
@@ -39,7 +39,7 @@ if (ios_sdk_path == "") {
   if (!use_ios_simulator && ios_device_sdk_path == "") {
     ios_sdk_args += [
       "--sdk",
-      "iphoneos",
+      "appletvos",
     ]
     _ios_device_sdk_result =
         exec_script("ios_sdk.py", ios_sdk_args, "list lines")
@@ -49,7 +49,7 @@ if (ios_sdk_path == "") {
   if (use_ios_simulator && ios_simulator_sdk_path == "") {
     ios_sdk_args += [
       "--sdk",
-      "iphonesimulator",
+      "appletvsimulator",
     ]
     _ios_sim_sdk_result = exec_script("ios_sdk.py", ios_sdk_args, "list lines")
     ios_simulator_sdk_path = _ios_sim_sdk_result[0]

diff --git a/build/config/ios/ios_sdk.py b/build/config/ios/ios_sdk.py
@@ -19,7 +19,7 @@ def main(argv):
   parser.add_argument('--symlink',
                       help='Whether to create a symlink in the buildroot to the SDK.')
   parser.add_argument('--sdk',
-                      choices=['iphoneos', 'iphonesimulator'],
+                      choices=['iphoneos', 'iphonesimulator', 'appletvos', 'appletvsimulator'],
                       help='Which SDK to find.')
   args = parser.parse_args()
 

diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
@@ -227,7 +227,7 @@ mac_toolchain("ios_clang_arm") {
   cxx = "$prefix/clang++"
   ld = cxx
   is_clang = true
-  sysroot_flags = "-isysroot $ios_device_sdk_path -miphoneos-version-min=$ios_deployment_target"
+  sysroot_flags = "-isysroot $ios_device_sdk_path -mtvos-version-min=$ios_deployment_target"
 }
 
 # Toolchain used for iOS simulator targets (arm64).
@@ -253,7 +253,7 @@ mac_toolchain("ios_clang_x64_sim") {
   cxx = "$prefix/clang++"
   ld = cxx
   is_clang = true
-  sysroot_flags = "-isysroot $ios_simulator_sdk_path -mios-simulator-version-min=$ios_deployment_target"
+  sysroot_flags = "-isysroot $ios_simulator_sdk_path -mappletvsimulator-version-min=$ios_deployment_target"
 }
 
 # Toolchain used for Mac X64 host targets.