Fix mDNS for iOS13 (flutter#13451)

CaseyHillers · Nov 1, 2019 · 0a8bd9d · 0a8bd9d
1 parent d8d5e43
commit 0a8bd9d
Show file tree

Hide file tree

Showing 11 changed files with 183 additions and 128 deletions.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -18,7 +18,6 @@ FILE: ../../../flutter/assets/directory_asset_bundle.h
 FILE: ../../../flutter/benchmarking/benchmarking.cc
 FILE: ../../../flutter/benchmarking/benchmarking.h
 FILE: ../../../flutter/common/exported_symbols.sym
-FILE: ../../../flutter/common/runtime.h
 FILE: ../../../flutter/common/settings.cc
 FILE: ../../../flutter/common/settings.h
 FILE: ../../../flutter/common/task_runners.cc

diff --git a/common/BUILD.gn b/common/BUILD.gn
@@ -10,7 +10,6 @@ config("flutter_config") {
 
 source_set("common") {
   sources = [
-    "runtime.h",
     "settings.cc",
     "settings.h",
     "task_runners.cc",

diff --git a/common/config.gni b/common/config.gni
@@ -43,13 +43,23 @@ feature_defines_list = [
 ]
 
 if (flutter_runtime_mode == "debug") {
-  feature_defines_list += [ "FLUTTER_RUNTIME_MODE=1" ]
+  feature_defines_list += [
+    "FLUTTER_RUNTIME_MODE=1",
+    "FLUTTER_JIT_RUNTIME=1",
+  ]
 } else if (flutter_runtime_mode == "profile") {
   feature_defines_list += [ "FLUTTER_RUNTIME_MODE=2" ]
 } else if (flutter_runtime_mode == "release") {
-  feature_defines_list += [ "FLUTTER_RUNTIME_MODE=3" ]
+  feature_defines_list += [
+    "FLUTTER_RUNTIME_MODE=3",
+    "FLUTTER_RELEASE=1",
+  ]
 } else if (flutter_runtime_mode == "jit_release") {
-  feature_defines_list += [ "FLUTTER_RUNTIME_MODE=4" ]
+  feature_defines_list += [
+    "FLUTTER_RUNTIME_MODE=4",
+    "FLUTTER_RELEASE=1",
+    "FLUTTER_JIT_RUNTIME=1",
+  ]
 } else {
   feature_defines_list += [ "FLUTTER_RUNTIME_MODE=0" ]
 }

diff --git a/common/runtime.h b/common/runtime.h
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "flutter/common/runtime.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/paint_utils.h"
 #include "flutter/fml/logging.h"

diff --git a/runtime/dart_snapshot.cc b/runtime/dart_snapshot.cc
@@ -6,7 +6,6 @@
 
 #include <sstream>
 
-#include "flutter/common/runtime.h"
 #include "flutter/fml/native_library.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"

diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc
@@ -9,7 +9,6 @@
 #include <mutex>
 #include <vector>
 
-#include "flutter/common/runtime.h"
 #include "flutter/common/settings.h"
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/file.h"

diff --git a/shell/common/shell.cc b/shell/common/shell.cc
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "flutter/assets/directory_asset_bundle.h"
-#include "flutter/common/runtime.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/icu_util.h"
 #include "flutter/fml/log_settings.h"

diff --git a/shell/common/shell_unittests.cc b/shell/common/shell_unittests.cc
@@ -9,7 +9,6 @@
 #include <future>
 #include <memory>
 
-#include "flutter/common/runtime.h"
 #include "flutter/flow/layers/layer_tree.h"
 #include "flutter/flow/layers/transform_layer.h"
 #include "flutter/fml/command_line.h"

diff --git a/shell/common/switches.cc b/shell/common/switches.cc
@@ -9,7 +9,6 @@
 #include <sstream>
 #include <string>
 
-#include "flutter/common/runtime.h"
 #include "flutter/fml/native_library.h"
 #include "flutter/fml/paths.h"
 #include "flutter/fml/size.h"