tree bd3d189abfd413cadaa27a387a329b3fdd69ada3
parent 25095c61be6171dbfa225570f5e35693cde77fcd
author Eric Seckler <eseckler@google.com> 1573668198 +0000
committer Eric Seckler <eseckler@google.com> 1573669924 +0000

build: Fix chrome ODR violations

Both proto2json and tracing depend on common sources (e.g. perfetto
base), which causes ODR violations in chrome. Fix by merging the two
targets.

Bug: chromium:1024267
TBR: skyostil@google.com
Change-Id: Icffd68404e1edc9f580cc819013adb67d851ab67