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

Copying our pre-generated midl files to overwrite upstream midl files #303

Merged
merged 1 commit into from
Jun 26, 2018

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Jun 7, 2018

Chromum compares pre-installed midl files and generated midl files from
IDL file during the build to check integrity.
Generated files during the build time and upstream generated files are
different because we use different IDL file(google_update_idl.idl) for google update.
So, we should copy our pre-installed files to overwrite upstream
pre-installed files.

Also, these files should not be the target of update_patches command.

issue: #179

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).
  • 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.

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

@simonhong simonhong self-assigned this Jun 12, 2018
@simonhong simonhong requested review from bbondy and bridiver June 14, 2018 20:23
@simonhong simonhong changed the title WIP: Copying our pre-generated midl files to overwrite upstream midl files Copying our pre-generated midl files to overwrite upstream midl files Jun 14, 2018
@simonhong simonhong requested a review from RyanJarv June 14, 2018 20:33
@simonhong simonhong force-pushed the copying_midl_files branch from c1ea23b to f7c8741 Compare June 19, 2018 02:20
…iles

Chromium compares pre-installed midl files and generated midl files from
IDL file during the build to check integrity.
In our case, generated files during the build time and pre-installed
upstream files(in src/third_party/win_build_outout/midl/google_update) are
different because we use different IDL file
(src/brave/chromium_src/google_update/google_update_idl.idl) for google
update. To pass this integrity check in the build phase, we should copy
our pre-installed files to overwrite upstream files.

Also, these files should not be the target of update_patches command.
@simonhong simonhong force-pushed the copying_midl_files branch from f7c8741 to 79f70c9 Compare June 26, 2018 00:51
@simonhong simonhong merged commit 6613501 into master Jun 26, 2018
@cezaraugusto cezaraugusto deleted the copying_midl_files branch July 9, 2018 15:24
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.

2 participants