This change updates how brave/chromium_src overrides can reference original files: it adds ability to use #include <...> along with #include "src/...". This is enabled by replacing -I../../brave/chromium_src with -iquote../../brave_chromium_src, which adds an include search path only for #include "..." directives.
With this approach, other files in the build tree can reference brave/chromium_src overrides using #include "...", while the overrides themselves can reference original Chromium files using #include <...>. Since Chromium uses #include "..." for all in-tree files, we can leverage this convention and configure our overrides so that we can drop support for #include "src/" later by removing -I../../.. and making rbe_exec_root modification obsolete (the main goal).
* Fix duplication of synced Android devices.
Override SyncServiceAndroidBridge::KeepAccountSettingsPrefsOnlyForUsers with empty implementation.
This prevents re-generating of device's cache_guid, which leads to appearing duplicated device at device list.
Fixesbrave/brave-browser#39470
Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/d291751ad49b35720b6928527d0b876b8a247a25
Make SyncTransportDataPrefs account-keyed
Before this CL, SyncTransportDataPrefs only stored data for the
currently-syncing account.
One consequence was that this data had to be cleared on signout, and
thus, signing out and back in would create a new set of data, in
particular a new cache GUID.
This CL makes SyncTransportDataPrefs account-keyed (behind a
killswitch), so data for multiple accounts can be kept around, even
after signout. This allows reusing the cache GUID when an account
signs back in.
Account-keyed data gets cleared when the corresponding account is
removed from the device, using the same code path that's already used
for other account-keyed prefs. It's also cleared when the sync server
requests it (e.g. CLIENT_DATA_OBSOLETE), and in some error cases.
Bug: 337034860
Change-Id: I979b302901b91dfe220971aec838add8d22846b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5537450
AlexeyBarabash