Skip to content

Reintroduce #21527 (boringssl submodule unification - take two)#21833

Merged
jtattermusch merged 2 commits intogrpc:masterfrom
jtattermusch:reintroduce_again_21527
Jan 31, 2020
Merged

Reintroduce #21527 (boringssl submodule unification - take two)#21833
jtattermusch merged 2 commits intogrpc:masterfrom
jtattermusch:reintroduce_again_21527

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

@jtattermusch jtattermusch commented Jan 30, 2020 •
edited
Loading

Another attempt to reintroduce #21797 (after revert in #21805)

This tries to solve the problem with internal import of crypto_test_data.cc:

  • looks like the crypto_test_data.cc is not really needed for anything in our repo (and there's another copy in third_party/boringssl-with-bazel anyway), so I just stopped generating it in src/boringssl/gen_build_yaml.py
  • added some comments to gen_build_yaml.py to explain what it actually does

@jtattermusch jtattermusch force-pushed the reintroduce_again_21527 branch from 5a30d49 to 7ef862d Compare January 30, 2020 09:13
@jtattermusch jtattermusch mentioned this pull request Jan 30, 2020
Closed
@jtattermusch jtattermusch added release notes: yes Indicates if PR needs to be in release notes lang/c++ lang/core and removed lang/c++ labels Jan 30, 2020
This was referenced Jan 30, 2020
Closed
Merged
@hcaseyal
Copy link
Copy Markdown
Contributor

hcaseyal commented Jan 30, 2020

LGTM for the internal import

@jtattermusch jtattermusch merged commit b8aa71d into grpc:master Jan 31, 2020
@stanley-cheung stanley-cheung mentioned this pull request Mar 9, 2020
Merged
@lock lock bot locked as resolved and limited conversation to collaborators May 5, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@apolcyn apolcyn Awaiting requested review from apolcyn

@gnossen gnossen Awaiting requested review from gnossen

@nicolasnoble nicolasnoble Awaiting requested review from nicolasnoble

1 more reviewer

@veblush veblush veblush approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@nicolasnoble nicolasnoble

@hcaseyal hcaseyal

Labels

lang/core release notes: yes Indicates if PR needs to be in release notes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jtattermusch @hcaseyal @veblush @nicolasnoble