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

Don't build brave_settings_import_data_handler on Android #4711

Merged
merged 1 commit into from
Feb 22, 2020

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Feb 21, 2020

Resolves brave/brave-browser#8356

Issue introduced by #4530

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.

@emerick emerick self-assigned this Feb 21, 2020
@emerick emerick added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Feb 21, 2020
@@ -176,10 +177,6 @@ source_set("ui") {
sources += [
"webui/settings/brave_settings_import_data_handler_mac.mm",
]
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this entire block needs to move up to https://github.com/brave/brave-core/pull/4711/files#diff-4298e412eb456ad3ceed2346abb95f6aR99 to avoid building brave_settings_import_data_handler.cc in macos

@emerick emerick removed CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Feb 21, 2020
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.

++

@emerick emerick merged commit 7ed0673 into master Feb 22, 2020
@emerick emerick deleted the fix-android-build branch February 22, 2020 00:16
@bsclifton bsclifton added this to the 1.7.x - Nightly milestone Feb 23, 2020
@bsclifton
Copy link
Member

Updated to add missing milestone to both this and brave/brave-browser#8356

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.

[Android] Undefined ImportDataHandler symbols
5 participants