Skip to content

core: apply protobuf patch to prevent duplicate symbols#618

Merged
rebello95 merged 6 commits intomasterfrom
dupe-symbols
Dec 31, 2019
Merged

core: apply protobuf patch to prevent duplicate symbols#618
rebello95 merged 6 commits intomasterfrom
dupe-symbols

Conversation

@rebello95
Copy link
Copy Markdown
Contributor

@rebello95 rebello95 commented Dec 31, 2019

Fixes #617, which resulted in duplicate symbols from protobuf being present in the final Envoy Mobile binary.

The root cause is being patched in Bazel. In the meantime, we can revert these two commits in protobuf (first, second) and apply the diff as a patch until we're able to update Bazel with the fix. More context on the protobuf issue is available here.

Notes:

  • This should be reverted after updating Bazel with the fix
  • The version of protobuf specified in the http_archive should be in lockstep with upstream Envoy's version
  • Upstream Envoy's @envoy//bazel:protobuf.patch patch is also included here

Signed-off-by: Michael Rebello me@michaelrebello.com

Signed-off-by: Michael Rebello <me@michaelrebello.com>
Signed-off-by: Michael Rebello <me@michaelrebello.com>
Signed-off-by: Michael Rebello <me@michaelrebello.com>
Signed-off-by: Michael Rebello <me@michaelrebello.com>
Signed-off-by: Michael Rebello <me@michaelrebello.com>
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95 rebello95 requested a review from keith December 31, 2019 06:08
@rebello95 rebello95 marked this pull request as ready for review December 31, 2019 06:08
Copy link
Copy Markdown
Contributor

@goaway goaway left a comment

Choose a reason for hiding this comment

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

nice work, thank you!

@rebello95 rebello95 merged commit 3052a69 into master Dec 31, 2019
@rebello95 rebello95 deleted the dupe-symbols branch December 31, 2019 16:33
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.

core: duplicate symbols coming from protobuf

3 participants