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

Jump to bottom

Clean re-do of patches from https://github.com/brave/brave-core/pull/… #2160

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Clean re-do of patches from https://github.com/brave/brave-core/pull/… #2160

merged 1 commit into from
Apr 4, 2019

Conversation

bsclifton
Copy link
Member

…2059

Fixes brave/brave-browser#3854
Already merged to 0.64.x and above with #2036

Compiled and verified they work great on 0.63.x

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) on
    • Windows
    • macOS
    • Linux
  • Verified that all lint errors/warnings are resolved (npm run lint)
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@bsclifton bsclifton added this to the 0.63.x - Beta milestone Apr 4, 2019
@bsclifton bsclifton self-assigned this Apr 4, 2019
@bsclifton bsclifton requested review from petemill and mkarolin April 4, 2019 18:06
mkarolin
mkarolin reviewed Apr 4, 2019
View reviewed changes
patches/ui-base-BUILD.gn.patch
@@ -1,5 +1,5 @@
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..25349fd0787e0fd9c913fab16d3c646bf856f1f9 100644
index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..3fbf1a1e7276481638ad79943b9e4cfa51ed6698 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -395,6 +395,7 @@ jumbo_component("base") {
Copy link
Collaborator

@mkarolin mkarolin Apr 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think this diff is needed any longer since //brave/ui/base:chromium_deps also includes //brave/ui/webui/resources.

Copy link
Member

Choose a reason for hiding this comment

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

I'm confused - we do need this patch otherwise nothing is including brave/base/ui/BUILD.gn

Copy link
Collaborator

@mkarolin mkarolin Apr 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Right, what I meant is we need the patch, but the patch has 2 diffs in it. I don't think the first diff is needed. That is we need @@ -407,6 +408,8 but not @@ -395,6 +395,7.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I can fix it when I merge C74 in, though, so no big deal. It doesn't hurt, it's just redundant.

Copy link
Member Author

@bsclifton bsclifton Apr 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

ah - this didn't change... it's just part of the original diff actually

Copy link
Collaborator

Choose a reason for hiding this comment

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

From what I see Pete's original change removes that part: https://github.com/brave/brave-core/pull/2036/files#diff-588f3fba9a54e71be0b127f12f6faf94L9

@bsclifton bsclifton force-pushed the fix-ui-base-build-error-0.63.x branch 2 times, most recently from 28cc575 to 30aa36f Compare April 4, 2019 18:27
petemill
petemill reviewed Apr 4, 2019
View reviewed changes
patches/chrome-VERSION.patch Outdated
@@ -1,5 +1,5 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 3d9a560e26e43fb2da1332dff339c1039cfb1a3e..7b2d1041533f1aacdeefb8524a4c433f390091b0 100644
Copy link
Member

Choose a reason for hiding this comment

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

We don't need this patch in this PR though, right...?

Copy link
Member Author

Choose a reason for hiding this comment

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

I can remove it 😄 It just came up when I did npm run update-patches

@bsclifton
Clean re-do of patches from #2059
ae19619 
Compiled and verified they work great on 0.63.x
@bsclifton bsclifton force-pushed the fix-ui-base-build-error-0.63.x branch from 30aa36f to ae19619 Compare April 4, 2019 18:32
bsclifton
bsclifton commented Apr 4, 2019
View reviewed changes
patches/ui-base-BUILD.gn.patch
@@ -1,5 +1,5 @@
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..25349fd0787e0fd9c913fab16d3c646bf856f1f9 100644
index 195435b5cc3a6aefc5464f9a5bd8919884783bcb..3fbf1a1e7276481638ad79943b9e4cfa51ed6698 100644
Copy link
Member Author

Choose a reason for hiding this comment

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

@mkarolin is this what you're saying is not needed? Besides the below deps += [ "//brave/ui/base:chromium_deps" ], this should be the only diff in this patch

@bsclifton bsclifton merged commit 23008de into 0.63.x Apr 4, 2019
@bsclifton bsclifton deleted the fix-ui-base-build-error-0.63.x branch April 4, 2019 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkarolin mkarolin mkarolin approved these changes

@petemill petemill petemill left review comments

Assignees

@bsclifton bsclifton

Labels
None yet
Projects
None yet
Milestone
0.63.x - Release
Development

Successfully merging this pull request may close these issues.
3 participants
@bsclifton @petemill @mkarolin