1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
# `redaction_tool`: PII Redaction Tool
A redaction_tool redacts the following PII using a wide set of RegEx expressions:
kAndroidAppStoragePath
kEmail
kGaiaID
kIPPAddress
kIPAddress
kLocationInfo
kMACAddress
kUIHierarchyWindowTitles
kURL
kSerial
kSSID
kStableIdentifier
kVolumeLabel
The `cros/upstream/main` branch is a mirror of the
`components/feedback/redaction_tool` directory
from 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`
* `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/feedback").
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:
```bash
(chroot) $ git push HEAD:refs/for/main
```
|
