Google Git
Sign in
chromium / chromiumos / platform / cbor / refs/heads/stabilize-14918.B
commit35fe21779fddc0d376da13dab49e31fa3491205f[log] [tgz]
authorGrace Cham <hscham@chromium.org>Mon May 30 01:05:10 2022
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>Thu Jun 02 02:08:29 2022
treefa22c2326c89f0ccbecf5d2e3635701867e62b85
parent9e852aa145930d6ebb990d4e8f84e5907a1321de [diff]
cbor: replace base::size with std::size

Will be removed from base/cxx17_backports.h from libchrome r979799
(crrev.com/c/3511268).

BUG=b:228144902
TEST=FEATURES=test emerge-hatch cbor

Change-Id: Ibf5a16863a18b98695799f56ef25b04dee488e8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/3676632
Commit-Queue: Grace Cham <hscham@chromium.org>
Tested-by: Grace Cham <hscham@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
2 files changed
tree: fa22c2326c89f0ccbecf5d2e3635701867e62b85
  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. DIR_METADATA
  9. OWNERS
  10. reader.cc
  11. reader.h
  12. reader_fuzzer.cc
  13. reader_unittest.cc
  14. README.md
  15. values.cc
  16. values.h
  17. values_unittest.cc
  18. writer.cc
  19. writer.h
  20. 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 in order to avoid code duplication.

The cros/upstream/main 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 remote update

  • git checkout -b main cros/main

  • git merge cros/upstream/main

    • Expect merge conflicts, because of the difference in header paths.
    • OWNERS should use the version from main.
    • BUILD.gn should mostly use the version from main, unless the upstream changes the files to be built.
    • The #include paths should use the version from main (without “components/”). This should be the majority of the merge conflicts.
    • In the commit message of the merge, list the commits from upstream that are merged.
    • If you need to do make changes to the merged commits (outside of conflicts), do that work in separate commits. For example, if you need to revert commits, use git revert after committing the merge commit. This preserves the history and makes it clear why a change is being reverted rather than quietly changing it in the merge commit.
    • 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.

  • Push the resulting merge commit with:

    (chroot) $ git push HEAD:refs/for/main