Google Git
Sign in
chromium / chromiumos / platform / cbor / refs/heads/stabilize-13099.73.B
commit843ce7097112162c3290dd60b2518d3632aa4533[log] [tgz]
authorYicheng Li <yichengli@chromium.org>Fri Apr 10 04:07:31 2020
committerCommit Bot <commit-bot@chromium.org>Fri Apr 10 11:17:54 2020
treeecae8a3bc3d18ee1ac05ea142d55befc7004e0c3
parent5da4a4e6d73e86ee47bc8b30e98f229c719ed13e [diff]
Squash-merge changes from upstream

Merge changes from https://chromium.googlesource.com/chromium/src:

cce8f294b365 cbor: Fix typedef struct naming for new CrOS Clang updates
bd122a20ab2e [base] Remove const iterator member functions from span
768272463b36 Remove more MSVC compat hack

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

Change-Id: I1e718c286b7031df840975971541ceb90117433b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/2145296
Reviewed-by: Yicheng Li <yichengli@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Yicheng Li <yichengli@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
3 files changed
tree: ecae8a3bc3d18ee1ac05ea142d55befc7004e0c3
  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