Google Git
Sign in
chromium / chromiumos / platform / cbor / refs/heads/factory-endeavour-13295.B
commit50b7da853146eefb17ada6047865f22a4af53bc6[log] [tgz]
authorYicheng Li <yichengli@chromium.org>Mon Jun 01 16:49:27 2020
committerYicheng Li <yichengli@chromium.org>Mon Jun 01 17:15:53 2020
treef8d6d47167ee3dc32e8fb75f6db76f2bcc3c599c
parent843ce7097112162c3290dd60b2518d3632aa4533 [diff]
parent3287dea58206deb033aede1e8dd93523277ce0a6 [diff]
Merge remote-tracking branch 'cros/upstream/master'

Related changes:
3287dea Remove/replace unnecessary logging.h includes in .cc files (components)
1008f96 logging.h related include-what-you-use (components/)

BUG=none
TEST=FEATURES=test emerge-nami cbor

Change-Id: Iddeee62aa13cb193347f3fb0c0b44a6a96b7d1fc
tree: f8d6d47167ee3dc32e8fb75f6db76f2bcc3c599c
  1. reader_fuzzer_corpus/
  2. BUILD.gn
  3. cbor_export.h
  4. constants.h
  5. diagnostic_writer.cc
  6. diagnostic_writer.h
  7. diagnostic_writer_unittest.cc
  8. OWNERS
  9. reader.cc
  10. reader.h
  11. reader_fuzzer.cc
  12. reader_unittest.cc
  13. README.md
  14. values.cc
  15. values.h
  16. values_unittest.cc
  17. writer.cc
  18. writer.h
  19. writer_unittest.cc
README.md

cbor: Concise Binary Object Representation

This library is a partial implementation of the RFC 7049 Concise Binary Object Representation standard.

The source code was fetched from chromium/src (https://chromium.googlesource.com/chromium/src/+/242df8b64d2a0ab5f057d1d4c76ea8537fdbb789) in order to avoid code duplication.

How to update the source

To pull in updates from chromium/src, do the following:

  • git remote add upstream https://chromium.googlesource.com/chromium/src
  • git fetch upstream master
  • git checkout -b staging-branch upstream/master
  • git subtree split -P components/cbor -b synthetic-branch
    • This could take ~2 hours
  • git checkout master
  • git merge --allow-unrelated-histories -s subtree synthetic-branch
    • Resolve merge conflicts, if any.
    • In the commit message of the merge, describe what changes are added, with original commit hash in chromium/src. E.g. using “git checkout staging-branch && git log --oneline components/cbor”
  • git branch -D staging-branch synthetic-branch
  • git remote remove upstream