commit | 9e852aa145930d6ebb990d4e8f84e5907a1321de | [log] [tgz] |
---|---|---|
author | hscham <hscham@chromium.org> | Wed Mar 23 03:30:22 2022 |
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Mar 25 08:49:54 2022 |
tree | e78ee0c6d51aa16c25235b7f6da84258a87c18cc | |
parent | b88c63453b18ef3b6058377aee2cbb5152dda39b [diff] |
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 <hscham@chromium.org> Reviewed-by: Tom Hughes <tomhughes@chromium.org> Commit-Queue: Grace Cham <hscham@chromium.org>
cbor
: Concise Binary Object RepresentationThis 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.
To pull in updates from chromium/src
, do the following:
git remote update
git checkout -b main cros/main
git merge cros/upstream/main
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.#include
paths should use the version from main
(without “components/”). This should be the majority of the merge conflicts.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.Push the resulting merge commit with:
(chroot) $ git push HEAD:refs/for/main