Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to removal of sync_protocol_pyprotos GN variable

Browse Source 
We no need to extend two lists with *.proto and *_pb2.py sources, only
*.proto are used now, so we can simplify a bit the patch.

Chromium changes:

https://source.chromium.org/chromium/chromium/src/+/1428c9b7ec5f1c4bf8a1cdfd23d29ecb74606328

commit 1428c9b7ec5f1c4bf8a1cdfd23d29ecb74606328
Author: Victor Hugo Vianna Silva <victorvianna@google.com>
Date:   Fri Feb 18 11:50:05 2022 +0000

    [sync] Remove unused sync_protocol_pyprotos variable in GN

    Bug: None
This commit is contained in:
Mario Sanchez Prada
2022-04-15 18:24:35 -04:00
committed by mkarolin
parent ad7727730b
commit 342ca595ea
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/sync/protocol/protocol_sources.gni
+2 -12
View File
@@ -3,15 +3,5 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
brave_sync_protocol_bases = [
"brave_device_info_specifics",
]
brave_sync_protocol_sources = []
brave_sync_protocol_pyprotos = []
foreach(base, brave_sync_protocol_bases) {
brave_sync_protocol_sources += [ "//brave/components/sync/protocol/${base}.proto" ]
brave_sync_protocol_pyprotos +=
[ "$root_out_dir/pyproto/components/sync/protocol/${base}_pb2.py" ]
}
brave_sync_protocol_sources =
[ "//brave/components/sync/protocol/brave_device_info_specifics.proto" ]
patches/components-sync-protocol-protocol_sources.gni.patch
+6 -6
View File
@@ -1,9 +1,9 @@
diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni
index 5e136c9efcff3ce06775662334f660ed032e7b66..2549ec4b7216feee13d02b5bee64da6251a07a98 100644
index 000d0ff8cf2ce42a2f2daf177ca03681b75c4bba..4584c7d0351dc254228eb9edd87f7932bb9982ac 100644
--- a/components/sync/protocol/protocol_sources.gni
+++ b/components/sync/protocol/protocol_sources.gni
@@ -81,3 +81,4 @@ foreach(base, sync_protocol_bases) {
sync_protocol_pyprotos +=
[ "$root_out_dir/pyproto/components/sync/protocol/${base}_pb2.py" ]
}
+import("//brave/components/sync/protocol/protocol_sources.gni") sync_protocol_sources += brave_sync_protocol_sources sync_protocol_pyprotos += brave_sync_protocol_pyprotos
@@ -72,3 +72,4 @@ sync_protocol_sources = [
"wifi_configuration_specifics.proto",
"workspace_desk_specifics.proto",
]
+import("//brave/components/sync/protocol/protocol_sources.gni") sync_protocol_sources += brave_sync_protocol_sources