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

…pleTV
LibertyGlobal · Jul 13, 2023 · 4d9e1b8 · 4d9e1b8
1 parent 8d5b878
commit 4d9e1b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/runtime/bin/process_macos.cc b/runtime/bin/process_macos.cc
@@ -167,9 +167,11 @@ class ExitCodeHandler {
     running_ = false;
 
     // Fork to wake up waitpid.
+#if !(defined(TARGET_OS_TV) && TARGET_OS_TV)
     if (TEMP_FAILURE_RETRY(fork()) == 0) {
       _Exit(0);
     }
+#endif
 
     monitor_->Notify();
 
@@ -300,6 +302,7 @@ class ProcessStarter {
   }
 
   int Start() {
+#if !(defined(TARGET_OS_TV) && TARGET_OS_TV)
     // Create pipes required.
     int err = CreatePipes();
     if (err != 0) {
@@ -389,6 +392,7 @@ class ProcessStarter {
     ASSERT(exec_control_[1] == -1);
 
     *id_ = pid;
+#endif
     return 0;
   }
 
@@ -447,6 +451,7 @@ class ProcessStarter {
   }
 
   void ExecProcess() {
+#if !(defined(TARGET_OS_TV) && TARGET_OS_TV)
     if (mode_ == kNormal) {
       if (TEMP_FAILURE_RETRY(dup2(write_out_[0], STDIN_FILENO)) == -1) {
         ReportChildError();
@@ -479,9 +484,11 @@ class ProcessStarter {
 
     execvp(path_, const_cast<char* const*>(program_arguments_));
     ReportChildError();
+#endif
   }
 
   void ExecDetachedProcess() {
+#if !(defined(TARGET_OS_TV) && TARGET_OS_TV)
     if (mode_ == kDetached) {
       ASSERT(write_out_[0] == -1);
       ASSERT(write_out_[1] == -1);
@@ -545,6 +552,7 @@ class ProcessStarter {
       // to prevent deadlocks.
       _Exit(0);
     }
+#endif
   }
 
   int RegisterProcess(pid_t pid) {

diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
@@ -118,7 +118,7 @@
 // Define the flavor of Mac OS we are running on.
 #include <TargetConditionals.h>
 #define DART_HOST_OS_MACOS 1
-#if TARGET_OS_IPHONE
+#if defined(TARGET_OS_IPHONE) || defined(TARGET_OS_TV)
 #define DART_HOST_OS_IOS 1
 #endif
 

diff --git a/runtime/vm/compiler/ffi/abi.cc b/runtime/vm/compiler/ffi/abi.cc
@@ -54,7 +54,7 @@ static_assert(offsetof(AbiAlignmentUint64, i) == 8,
 #elif defined(DART_TARGET_OS_LINUX)
 #define DART_TARGET_OS_NAME Linux
 #elif defined(DART_TARGET_OS_MACOS)
-#if DART_TARGET_OS_MACOS_IOS
+#if defined(DART_TARGET_OS_MACOS_IOS) || defined(TARGET_OS_TV)
 #define DART_TARGET_OS_NAME IOS
 #else
 #define DART_TARGET_OS_NAME MacOS

diff --git a/runtime/vm/cpu_arm.cc b/runtime/vm/cpu_arm.cc
@@ -59,7 +59,7 @@ DEFINE_FLAG(bool,
             "Use integer division instruction if supported");
 
 #if defined(TARGET_HOST_MISMATCH)
-#if defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_MACOS_IOS)
+#if defined(DART_TARGET_OS_ANDROID) || defined(DART_TARGET_OS_MACOS_IOS) || defined(TARGET_OS_TV)
 DEFINE_FLAG(bool, sim_use_hardfp, false, "Use the hardfp ABI.");
 #else
 DEFINE_FLAG(bool, sim_use_hardfp, true, "Use the hardfp ABI.");