-
Notifications
You must be signed in to change notification settings - Fork 892
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.
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
Fix build dependency issue with settings and extension pages resources #7599
Conversation
"../../../../ui/webui/resources:preprocess", | ||
] | ||
excludes = [ "chrome://resources/js/cr.m.js" ] | ||
+ deps += brave_deps_chrome_browser_resources_extensions_build |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we still need the other patch in this file? https://github.com/brave/brave-core/pull/7599/files#diff-5606dbee6795afa01ac32eebfe4d4cfc97f19d928fc34fac419a49599530a6adR17
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe we do need the other patch as line 17 in patches/chrome-browser-resources-settings-BUILD.gn.patch
is used for our settings customizations. This is a different page
cc: @petemill
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bridiver I believe we do as they are different sets of files used at different steps of the build, and we can't simply add these new ones to that other brave target because it still won't guarantee it will happen in the right order, and we can't add the deps only in the other place as that's inside a optimize_webui
conditional.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bsclifton same applies to both settings and extensions. They both need 2 patches as far as I can tell so far.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
approving to unbreak the build, but I'd like to follow-up and make sure we have only the patches we need and not any extra
re-building macos |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++
Merging because CI is only being problematic for macOS and that's build-instance related, not PR-related. We've tested ourselves with macOS, all the other platforms have built ok with CI and this is only a dep addition aimed to fix CI. |
Resolves brave/brave-browser#13567
This should be uplifted to wherever chromium 88 is
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
,npm run lint
,npm run gn_check
,npm run tslint
git rebase master
(if needed).Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on.
Test Plan: