|author||hscham <email@example.com>||Wed Mar 23 03:30:22 2022|
|committer||Chromeos LUCI <firstname.lastname@example.org>||Fri Mar 25 08:49:54 2022|
cbor: migrate base or absl optional to std::optional libchrome base::Optional is replaced by absl::optional on chromium upstream and removed in r885735. Since Chrome OS uses c++17, it can also use std::optional (as opposed to Chrome which uses c++14). See go/use-std-optional-in-cros for discussion. Note, libchrome uses absl::optional because upstream chromium uses C++14 and does not have std::optional. However, absl switched to always use std::optional implementation in crrev.com/c/2967691 so they are equivalent. LSC proposal: go/chromeos-lsc-optional-migration BUG=b:192529039 TEST=FEATURES=test emerge-hatch cbor Change-Id: I4b152a0306753e95e2e5d325c02e5af34af310b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/3531333 Tested-by: Grace Cham <email@example.com> Reviewed-by: Tom Hughes <firstname.lastname@example.org> Commit-Queue: Grace Cham <email@example.com>
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.
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.
To pull in updates from
chromium/src, do the following:
git remote update
git checkout -b main cros/main
git merge cros/upstream/main
OWNERSshould use the version from
BUILD.gnshould mostly use the version from
main, unless the upstream changes the files to be built.
#includepaths should use the version from
main(without “components/”). This should be the majority of the merge conflicts.
git revertafter 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.
Push the resulting merge commit with:
(chroot) $ git push HEAD:refs/for/main