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

Clone this repo:
  1. bd1416b Explicitly #include <ostream> by Georg Neis · 4 months ago factory-skyrim-15384.B firmware-skyrim-15369.B firmware-skyrim-15390.B main release-R112-15359.B release-R113-15393.B release-R114-15437.B release-R115-15474.B stabilize-15335.B stabilize-15359.45.B stabilize-15359.50.B stabilize-15359.58.B stabilize-15361.B stabilize-15364.B stabilize-15381.B stabilize-15393.48.B stabilize-15393.58.B stabilize-15395.B stabilize-15415.B stabilize-15429.B stabilize-15432.B stabilize-15437.42.B stabilize-15439.B stabilize-15446.B stabilize-15483.B stabilize-15485.B
  2. 55b1233 DIR_METADATA: Add V2 Test Plans. by Navil Perez · 9 months ago factory-brya-15231.B factory-corsola-15196.B factory-corsola-15197.B factory-nissa-15199.B factory-trogdor-15210.B firmware-corsola-15194.B firmware-duplo-15151.B firmware-nissa-15217.126.B firmware-nissa-15217.45.B firmware-nissa-15217.B release-R108-15183.B release-R109-15236.B release-R110-15278.B release-R111-15329.B stabilize-15167.B stabilize-15174.B stabilize-15183.14.B stabilize-15183.69.B stabilize-15183.82.B stabilize-15185.7.B stabilize-15185.B stabilize-15207.B stabilize-15208.B stabilize-15236.66.B stabilize-15245.B stabilize-15251.B stabilize-15278.64.B stabilize-15300.B stabilize-15301.B stabilize-15317.B stabilize-15329.44.B stabilize-15329.59.B stabilize-quickfix-15183.78.B stabilize-quickfix-15278.72.B
  3. 35fe217 cbor: replace base::size with std::size by Grace Cham · 1 year ago factory-brya-14909.124.B factory-foobar-15000.B factory-guybrush-14908.B firmware-14947.B firmware-chameleon-14947.B firmware-ti50-mp-15224.B firmware-ti50-prepvt-15086.B release-R104-14909.B release-R105-14989.B release-R106-15054.B release-R107-15117.B stabilize-14909.100.B stabilize-14918.B stabilize-14964.B stabilize-14989.107.B stabilize-14989.85.B stabilize-14998.B stabilize-15032.B stabilize-15033.B stabilize-15054.115.B stabilize-15054.26.B stabilize-15054.98.B stabilize-15072.B stabilize-15083.B stabilize-15086.B stabilize-15117.111.B stabilize-15117.48.B stabilize-15117.86.B stabilize-15120.B stabilize-15122.B stabilize-15129.B stabilize-quickfix-14909.132.B
  4. 9e852aa cbor: migrate base or absl optional to std::optional by hscham · 1 year, 3 months ago factory-14778.B factory-firmware-ti50-guc-14778.B release-R102-14695.B release-R103-14816.B stabilize-14633.B stabilize-14682.B stabilize-14695.107.B stabilize-14695.85.B stabilize-14771.B stabilize-14790.B stabilize-14803.B stabilize-14816.131.B stabilize-14816.138.B stabilize-14816.82.B stabilize-14816.84.B stabilize-14839.B stabilize-quickfix-14695.124.B stabilize-quickfix-14695.187.B stabilize-voshyr-14637.B
  5. b88c634 README.md: Update merge instructions by Tom Hughes · 1 year, 6 months ago factory-brya-14517.B factory-cherry-14455.B factory-guybrush-14600.B firmware-brya-14505.71.B firmware-brya-14505.B firmware-cherry-14454.B firmware-guybrush-14500.B release-R100-14526.B release-R101-14588.B release-R99-14469.B stabilize-14411.B stabilize-14438.B stabilize-14442.B stabilize-14469.41.B stabilize-14469.58.B stabilize-14469.8.B stabilize-14469.9.B stabilize-14477.B stabilize-14496.B stabilize-14498.B stabilize-14526.57.B stabilize-14526.67.B stabilize-14526.73.B stabilize-14526.84.B stabilize-14526.89.B stabilize-14528.B stabilize-14532.B stabilize-14536.B stabilize-14588.123.B stabilize-14588.14.B stabilize-14588.98.B stabilize-14589.B stabilize-14616.B stabilize-quickfix-14526.91.B stabilize-wristpin-14469.59.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 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