Skip to content

Commit 0a8bd9d

Browse files
authored
Fix mDNS for iOS13 (#13451)
1 parent d8d5e43 commit 0a8bd9d

File tree

11 files changed

+183
-128
lines changed

11 files changed

+183
-128
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ FILE: ../../../flutter/assets/directory_asset_bundle.h
1818
FILE: ../../../flutter/benchmarking/benchmarking.cc
1919
FILE: ../../../flutter/benchmarking/benchmarking.h
2020
FILE: ../../../flutter/common/exported_symbols.sym
21-
FILE: ../../../flutter/common/runtime.h
2221
FILE: ../../../flutter/common/settings.cc
2322
FILE: ../../../flutter/common/settings.h
2423
FILE: ../../../flutter/common/task_runners.cc

common/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ config("flutter_config") {
1010

1111
source_set("common") {
1212
sources = [
13-
"runtime.h",
1413
"settings.cc",
1514
"settings.h",
1615
"task_runners.cc",

common/config.gni

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,23 @@ feature_defines_list = [
4343
]
4444

4545
if (flutter_runtime_mode == "debug") {
46-
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=1" ]
46+
feature_defines_list += [
47+
"FLUTTER_RUNTIME_MODE=1",
48+
"FLUTTER_JIT_RUNTIME=1",
49+
]
4750
} else if (flutter_runtime_mode == "profile") {
4851
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=2" ]
4952
} else if (flutter_runtime_mode == "release") {
50-
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=3" ]
53+
feature_defines_list += [
54+
"FLUTTER_RUNTIME_MODE=3",
55+
"FLUTTER_RELEASE=1",
56+
]
5157
} else if (flutter_runtime_mode == "jit_release") {
52-
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=4" ]
58+
feature_defines_list += [
59+
"FLUTTER_RUNTIME_MODE=4",
60+
"FLUTTER_RELEASE=1",
61+
"FLUTTER_JIT_RUNTIME=1",
62+
]
5363
} else {
5464
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=0" ]
5565
}

common/runtime.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

flow/raster_cache.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <vector>
88

9-
#include "flutter/common/runtime.h"
109
#include "flutter/flow/layers/layer.h"
1110
#include "flutter/flow/paint_utils.h"
1211
#include "flutter/fml/logging.h"

runtime/dart_snapshot.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <sstream>
88

9-
#include "flutter/common/runtime.h"
109
#include "flutter/fml/native_library.h"
1110
#include "flutter/fml/paths.h"
1211
#include "flutter/fml/trace_event.h"

runtime/dart_vm.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <mutex>
1010
#include <vector>
1111

12-
#include "flutter/common/runtime.h"
1312
#include "flutter/common/settings.h"
1413
#include "flutter/fml/compiler_specific.h"
1514
#include "flutter/fml/file.h"

shell/common/shell.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <vector>
1111

1212
#include "flutter/assets/directory_asset_bundle.h"
13-
#include "flutter/common/runtime.h"
1413
#include "flutter/fml/file.h"
1514
#include "flutter/fml/icu_util.h"
1615
#include "flutter/fml/log_settings.h"

shell/common/shell_unittests.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <future>
1010
#include <memory>
1111

12-
#include "flutter/common/runtime.h"
1312
#include "flutter/flow/layers/layer_tree.h"
1413
#include "flutter/flow/layers/transform_layer.h"
1514
#include "flutter/fml/command_line.h"

shell/common/switches.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <sstream>
1010
#include <string>
1111

12-
#include "flutter/common/runtime.h"
1312
#include "flutter/fml/native_library.h"
1413
#include "flutter/fml/paths.h"
1514
#include "flutter/fml/size.h"

0 commit comments

Comments
 (0)