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

[Android] Fix for bytecode changes for SearchEngineAdapter #6102

Merged
merged 1 commit into from
Jul 16, 2020

Conversation

samartnik
Copy link
Contributor

@samartnik samartnik commented Jul 16, 2020

Resolves brave/brave-browser#10773

Submitter Checklist:

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

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@samartnik samartnik added CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Jul 16, 2020
@samartnik samartnik added this to the 1.13.x - Nightly milestone Jul 16, 2020
@samartnik samartnik self-assigned this Jul 16, 2020
@@ -89,7 +89,7 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java",
"../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSourcePreview.java",
"../../brave/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java",
"../../brave/android/java/org/chromium/chrome/browser/search_engines/settings/BraveBaseSearchEngineAdapter.java",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Renamed this one to avoid ambiguity with existing class brave/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java

Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

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

++

@samartnik samartnik merged commit 1613696 into master Jul 16, 2020
@samartnik samartnik deleted the android_search_engine_adapter_bytecode branch July 16, 2020 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Android] Bytecode patch is not applied to SearchEngineAdapter in release
2 participants