Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Roll clang with fix for ABI change" #45035

Closed
wants to merge 1 commit into from
Closed

Revert "Roll clang with fix for ABI change" #45035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ vars = {
# The list of revisions for these tools comes from Fuchsia, here:
# https://fuchsia.googlesource.com/integration/+/HEAD/toolchain
# If there are problems with the toolchain, contact fuchsia-toolchain@.
'clang_version': 'git_revision:020d2fb7711d70e296f19d83565f8d93d2cfda71',
'clang_version': 'git_revision:6d667d4b261e81f325756fdfd5bb43b3b3d2451d',

# The goma version and the clang version can be tightly coupled. If goma
# stops working on a clang roll, this may need to be updated using the value
Expand Down
2 changes: 0 additions & 2 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2582,7 +2582,6 @@ ORIGIN: ../../../flutter/shell/platform/common/text_editing_delta.h + ../../../f
ORIGIN: ../../../flutter/shell/platform/common/text_input_model.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/common/text_input_model.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/common/text_range.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/shell/platform/darwin/common/command_line.h + ../../../flutter/LICENSE
Expand Down Expand Up @@ -5337,7 +5336,6 @@ FILE: ../../../flutter/shell/platform/common/text_editing_delta.h
FILE: ../../../flutter/shell/platform/common/text_input_model.cc
FILE: ../../../flutter/shell/platform/common/text_input_model.h
FILE: ../../../flutter/shell/platform/common/text_range.h
FILE: ../../../flutter/shell/platform/darwin/common/availability_version_check.cc
FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
FILE: ../../../flutter/shell/platform/darwin/common/command_line.h
Expand Down
1 change: 0 additions & 1 deletion shell/platform/darwin/common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ source_set("common") {
cflags_objcc = flutter_cflags_objcc

sources = [
"availability_version_check.cc",
"buffer_conversions.h",
"buffer_conversions.mm",
"command_line.h",
Expand Down
48 changes: 0 additions & 48 deletions shell/platform/darwin/common/availability_version_check.cc
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions shell/platform/darwin/macos/framework/Source/FlutterAppDelegateTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ - (BOOL)handleOpenURLs:(NSArray<NSURL*>*)urls {
[[AppDelegateTestFlutterAppLifecycleDelegate alloc] init];
[appDelegate addApplicationLifecycleDelegate:delegate];

NSURL* URL = [NSURL URLWithString:@"https://flutter.dev"];
EXPECT_NE(URL, nil);
NSArray<NSURL*>* URLs = @[ URL ];
NSArray<NSURL*>* URLs = @[ [NSURL URLWithString:@"https://flutter.dev"] ];
[appDelegate application:NSApplication.sharedApplication openURLs:URLs];

EXPECT_EQ([delegate receivedURLs], URLs);
Expand All @@ -63,9 +61,7 @@ - (BOOL)handleOpenURLs:(NSArray<NSURL*>*)urls {
[appDelegate addApplicationLifecycleDelegate:firstDelegate];
[appDelegate addApplicationLifecycleDelegate:secondDelegate];

NSURL* URL = [NSURL URLWithString:@"https://flutter.dev"];
EXPECT_NE(URL, nil);
NSArray<NSURL*>* URLs = @[ URL ];
NSArray<NSURL*>* URLs = @[ [NSURL URLWithString:@"https://flutter.dev"] ];
[appDelegate application:NSApplication.sharedApplication openURLs:URLs];

EXPECT_EQ([firstDelegate receivedURLs], URLs);
Expand Down