Don't try to compile brave-rewards and brave-sync when disabled #4513
Conversation
|
I could not link the issue to the pull request ( brave/brave-browser#8072 (comment) ) |
|
@bridiver @NejcZdovc @darkdh can you check this one out please? 😄 Changes LGTM |
|
@bsclifton this PR needs to be moved in our repo so that we can run CI on it |
|
Created #4720 so that CI can run 😄 |
|
Successful CI run with #4720 🎉 Ready for review @NejcZdovc |
|
@NejcZdovc Kindly review |
|
@bsclifton Any updates? |
| #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h" | ||
|
|
||
| namespace extensions { | ||
|
|
||
| bool IsComponentExtensionWhitelisted(const std::string& extension_id) { | ||
| const char* const kAllowed[] = { | ||
| brave_extension_id, | ||
| #if BUILDFLAG(BRAVE_REWARDS_ENABLED) |
There was a problem hiding this comment.
preprocessor directives should not be indented
There was a problem hiding this comment.
I have removed the indentation for preprocessor.
chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
Show resolved
Hide resolved
chromium_src/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
Show resolved
Hide resolved
| #include "brave/components/brave_sync/grit/brave_sync_resources.h" | ||
| #endif | ||
| #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h" |
There was a problem hiding this comment.
this should be moved above the conditionally added includes
There was a problem hiding this comment.
I have moved the conditionally added includes
|
Created #5124 so that we can let this run through our CI system 😄 @akshay24495 can you squash the commits up into one? |
browser/BUILD.gn
Outdated
| @@ -136,6 +136,8 @@ source_set("browser_process") { | |||
| "//brave/components/brave_webtorrent/browser/buildflags", | |||
| "//brave/components/content_settings/core/browser", | |||
| "//brave/components/greaselion/browser/buildflags", | |||
| "//brave/components/brave_rewards/browser/buildflags", | |||
There was a problem hiding this comment.
sorry last thing, I know a bunch of these deps are already out of alphabetical order, but can you alphabetize them relative to this group of deps at least? https://github.com/brave/brave-core/pull/4513/files#diff-84f8700538180eec90bb2f4c9dff4da4R132
so "//brave/components/brave_rewards/browser/buildflags", would go after "//brave/components/brave_rewards/browser", and "//brave/components/brave_sync/buildflags", would go after "//brave/components/brave_shields/common",
There was a problem hiding this comment.
at least that way we won't be adding to the problem
Fixes brave/brave-browser#8072
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.