Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[iOS] - Fix brave://flags crash #26986

Merged
merged 2 commits into from
Dec 12, 2024
Merged

[iOS] - Fix brave://flags crash #26986

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c730f2b
Add minimal amount of resources for iOS's brave://flags to not crash
Brandon-T Dec 11, 2024
25c6501
Address feedback
Brandon-T Dec 11, 2024
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
10 changes: 8 additions & 2 deletions ui/webui/resources/sources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,22 @@ brave_resources_extra_grdps = []
brave_resources_extra_grdps_deps = []

# ios does not need any static resources
if (!is_ios) {
if (is_ios) {
brave_resources_extra_grdps += [
"$brave_resources_extra_grdps_path/brave_static_resources.grdp",
Brandon-T marked this conversation as resolved.
Show resolved Hide resolved
"$root_gen_dir/brave/web-ui-leo/leo.grdp",
]
} else {
brave_resources_extra_grdps += [
"$brave_resources_extra_grdps_path/brave_fonts_resources.grdp",
"$brave_resources_extra_grdps_path/brave_static_resources.grdp",
"$brave_resources_extra_grdps_path/brave_icons_resources.grdp",
"$root_gen_dir/brave/web-ui-leo/leo.grdp",
]
brave_resources_extra_grdps_deps += [ "//brave/ui/webui/resources:grdp" ]
}

brave_resources_extra_grdps_deps += [ "//brave/ui/webui/resources:grdp" ]

# At the moment, all non-static resources are only required for polymer WebUI.
# This could change and, when it does, the `include_polymer` conditional can be removed
# here and the one in //brave/ui/webui/resources/BUILD.gn be relied on to only add
Expand Down
Loading