This repository was archived by the owner on Feb 25, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +17
-6
lines changed Expand file tree Collapse file tree 4 files changed +17
-6
lines changed Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ vars = {
102
102
# Build bot tooling for iOS
103
103
'ios_tools_revision' : '69b7c1b160e7107a6a98d948363772dc9caea46f' ,
104
104
105
- 'buildtools_revision' : 'ae85410691b10aa2469695c2421b1fe751843e64 ' ,
105
+ 'buildtools_revision' : 'c1408453246f0475547b6fe634c2f3dad71c6457 ' ,
106
106
}
107
107
108
108
# Only these hosts are allowed for dependencies in this DEPS file.
@@ -115,7 +115,7 @@ allowed_hosts = [
115
115
]
116
116
117
117
deps = {
118
- 'src' : 'https://github.com/flutter/buildroot.git' + '@' + '7aadfaf196f9cd8a299f9ad78fab63362800466d ' ,
118
+ 'src' : 'https://github.com/flutter/buildroot.git' + '@' + 'be483cb1cd3a9c4313b2e534034d23a05c3d849e ' ,
119
119
120
120
# Fuchsia compatibility
121
121
#
Original file line number Diff line number Diff line change 29
29
#define ALLOW_SELF_MOVE (code_line ) code_line;
30
30
#endif
31
31
32
+ #if defined(__clang__)
33
+ #define ALLOW_SELF_ASSIGN_OVERLOADED (code_line ) \
34
+ _Pragma (" clang diagnostic push" ) \
35
+ _Pragma(" clang diagnostic ignored \" -Wself-assign-overloaded\" " ) \
36
+ code_line; \
37
+ _Pragma (" clang diagnostic pop" )
38
+ #else
39
+ #define ALLOW_SELF_ASSIGN_OVERLOADED (code_line ) code_line;
40
+ #endif
41
+
32
42
namespace fml {
33
43
namespace {
34
44
@@ -425,7 +435,7 @@ TEST(RefCountedTest, SelfAssignment) {
425
435
was_destroyed = false ;
426
436
RefPtr<MyClass> r (MakeRefCounted<MyClass>(&created, &was_destroyed));
427
437
// Copy.
428
- r = r;
438
+ ALLOW_SELF_ASSIGN_OVERLOADED ( r = r) ;
429
439
EXPECT_EQ (created, r.get ());
430
440
EXPECT_FALSE (was_destroyed);
431
441
}
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ source_set("flutter_channels") {
28
28
" ios/framework/Headers/FlutterBinaryMessenger.h" ,
29
29
" ios/framework/Headers/FlutterChannels.h" ,
30
30
" ios/framework/Headers/FlutterCodecs.h" ,
31
+ " ios/framework/Headers/FlutterMacros.h" ,
31
32
" ios/framework/Source/FlutterChannels.mm" ,
32
33
" ios/framework/Source/FlutterCodecs.mm" ,
33
34
" ios/framework/Source/FlutterStandardCodec.mm" ,
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ def to_gn_args(args):
89
89
gn_args ['is_debug' ] = args .unoptimized
90
90
gn_args ['android_full_debug' ] = args .target_os == 'android' and args .unoptimized
91
91
gn_args ['is_clang' ] = not sys .platform .startswith (('cygwin' , 'win' ))
92
-
92
+
93
93
gn_args ['embedder_for_target' ] = args .embedder_for_target
94
94
95
95
enable_lto = args .lto
@@ -248,9 +248,9 @@ def main(argv):
248
248
if sys .platform .startswith (('cygwin' , 'win' )):
249
249
subdir = 'win'
250
250
elif sys .platform == 'darwin' :
251
- subdir = 'mac'
251
+ subdir = 'mac-x64 '
252
252
elif sys .platform .startswith ('linux' ):
253
- subdir = 'linux64 '
253
+ subdir = 'linux-x64 '
254
254
else :
255
255
raise Error ('Unknown platform: ' + sys .platform )
256
256
You can’t perform that action at this time.
0 commit comments