Google Git
Sign in
chromium / chromiumos / platform / cbor / refs/heads/stabilize-14333.B
commitc08a8294142177b6ab622a019ec62fa46e72fc80[log] [tgz]
authorTom Hughes <tomhughes@chromium.org>Wed Nov 03 17:09:09 2021
committerCommit Bot <commit-bot@chromium.org>Fri Nov 05 17:20:07 2021
tree8fbcfaa9a5f6f9cca976d0fd007eb3dea063bf8a
parent67aa7858c5ceada16d1d26f54de99a35ecf00ecd [diff]
cbor: Update OWNERS

BUG=b:180546850
TEST=none

Change-Id: Ice162789115437fcf4d5d6dc6c2838de7a6acdf6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/3259746
Tested-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Josie Nordrum <josienordrum@google.com>
Commit-Queue: Tom Hughes <tomhughes@chromium.org>
1 file changed
tree: 8fbcfaa9a5f6f9cca976d0fd007eb3dea063bf8a
  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.

The cros/upstream/master branch is a mirror of the components/cbor directory from upstream. It is automatically updated to reflect the latest changes in upstream.

How to update the source

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

  • git checkout -b upstream cros/upstream/master
  • git checkout master
  • git merge --allow-unrelated-histories upstream
    • Expect merge conflicts, because of the difference in header paths.
    • OWNERS should use the version from master.
    • BUILD.gn should mostly use the version from master, unless the upstream changes the files to be built.
    • The #include paths should use the version from master (without “components/”). This should be the majority of the merge conflicts.
    • In the commit message of the merge, list the changes from upstream that are merged, with original commit hash from upstream.
    • Check the changes introduced by your merge by doing a diff against the commit before the merge. The difference should be the same as the changes in the upstream.