Fork of chromium/src.git/components/cbor/

Clone this repo:
  1. 2f808ca cbor: Update README for new merge instructions by Yicheng Li · 4 months ago factory-puff-13329.B factory-trogdor-13443.B factory-zork-13427.B firmware-puff-13324.B firmware-volteer-13521.B firmware-zork-13421.B firmware-zork-13434.B master release-R86-13421.B release-R87-13505.B stabilize-13360.B stabilize-13421.42.B stabilize-13421.53.B stabilize-13482.B stabilize-13525.B stabilize-13532.B stabilize-rust-13514.B
  2. 50b7da8 Merge remote-tracking branch 'cros/upstream/master' by Yicheng Li · 5 months ago factory-endeavour-13295.B release-R85-13310.B stabilize-13310.72.B stabilize-13310.74.B stabilize-13310.83.B stabilize-13310.94.B stabilize-13310.99.B stabilize-lazor-13278.B stabilize-quickfix-13310.73.B stabilize-quickfix-13310.76.B stabilize-quickfix-13310.91.B
  3. 3287dea Remove/replace unnecessary logging.h includes in .cc files (components) by Hans Wennborg · 6 months ago
  4. 1008f96 logging.h related include-what-you-use (components/) by Hans Wennborg · 6 months ago
  5. 843ce70 Squash-merge changes from upstream by Yicheng Li · 6 months ago factory-drallion-13080.B firmware-endeavour-13259.B release-R84-13099.B stabilize-13070.B stabilize-13099.101.B stabilize-13099.110.B stabilize-13099.118.B stabilize-13099.70.B stabilize-13099.72.B stabilize-13099.73.B stabilize-13099.85.B stabilize-13099.90.B stabilize-13099.94.B stabilize-quickfix-13099.93.B

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.