Upgrade patches from Chromium 78.0.3904.50 to Chromium 78.0.3904.70 (uplift to 0.71.x) #3774
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Upgrade patches from Chromium 78.0.3904.50 to Chromium 78.0.3904.70
4 tasks
bsclifton
added
CI/skip-ios
|
CI looks good, except for failure on build in Android. Restarting that one... |
yrliou
reviewed
Oct 22, 2019
| }; | ||
|
|
||
| const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { | ||
| + BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA |
There was a problem hiding this comment.
8ecdac3
This patch is added in 0.72.x and shouldn't be uplifted.
There was a problem hiding this comment.
That's why the android build failed as follows.
01:20:19 ../../chrome/browser/android/chrome_feature_list.cc:234:3: error: use of undeclared identifier 'BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA'
01:20:19 BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA
01:20:19 ^
01:20:19 1 error generated.
There was a problem hiding this comment.
@yrliou oh no! Can you help me remove it? That would explain the Android failure 😅
|
Lint failed, but everything else looks good! Thanks for the assist, @yrliou 😄👍 |
|
I used admin merge for this, but had gotten prior approval from @kjozwiak, @srirambv, and @LaurenWags (in that order!) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uplift of brave/brave-browser#6571
Fixes brave/brave-browser#6508
Related brave/brave-browser#6576
Approved, please ensure that before merging:
After you merge: