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.

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

Use buildflag instead of defines gn var #17443

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Mar 2, 2023

Resolves brave/brave-browser#28848

No functional changes.

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@simonhong simonhong self-assigned this Mar 2, 2023
Copy link
Contributor

@spylogsster spylogsster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@simonhong simonhong enabled auto-merge March 2, 2023 13:10
@simonhong simonhong merged commit e2531a4 into master Mar 2, 2023
@simonhong simonhong deleted the brave_vpn_buildflag branch March 2, 2023 15:04
@github-actions github-actions bot added this to the 1.51.x - Nightly milestone Mar 2, 2023
brave-builds added a commit that referenced this pull request Mar 3, 2023
kjozwiak pushed a commit that referenced this pull request Mar 3, 2023
import("//build/buildflag_header.gni")
import("buildflags.gni")

buildflag_header("buildflags") {
header = "buildflags.h"
flags = [ "ENABLE_BRAVE_VPN=$enable_brave_vpn" ]

if (is_win) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This absolutely does not belong here. We shouldn't be exposing channel information through a brave_vpn buildflag

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's really no reason for the vpn helper to be in components in the first place since it's win specific so it can just use install_static::GetChromeChannel
plus there are already layering violations in here with install_static

Copy link
Member Author

@simonhong simonhong Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed brave/brave-browser#35260 and working on it from #20754 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use buildflag for channel specific defines instead of defines gn vars
4 participants