Skip to content

Neva main rolling 7669 adaptation#29

Merged
Vanya-PIP merged 1 commit intoneva-main-rolling-7669from
neva-main-rolling-7669-adaptation
Feb 25, 2026
Merged

Neva main rolling 7669 adaptation#29
Vanya-PIP merged 1 commit intoneva-main-rolling-7669from
neva-main-rolling-7669-adaptation

Conversation

@Vanya-PIP
Copy link
Member

No description provided.

…into neva-main-rolling

Conflicts:
  base/BUILD.gn
  build/config/c++/c++.gni
  build/config/clang/clang.gni
  build/config/compiler/BUILD.gn
  build/config/linux/BUILD.gn
  chrome/browser/ui/views/profiles/avatar_toolbar_button_state_manager.cc

//base/BUILD.gn
Trivial conflict after the upstream CL https://crrev.com/c/7208619 which
implemented AsanRawPtrService V2.

//build/config/c++/c++.gni
//build/config/clang/clang.gni
Conflicts after the upstream CL https://crrev.com/c/7534428 which
enabled clang modules only when use_custom_libcxx is set.
Removed no more needed Neva code since now it builds OK with
use_safe_libstdcxx and use_clang_modules enabled.

//build/config/compiler/BUILD.gn
Trivial conflict after the upstream CL https://crrev.com/c/7511564 which
enabled use_debug_fission (split dwarf) at symbol_level=1. Neva supports
Clang and doesn't use GCC since M142, so removed Neva GCC workaround as
no more needed.

//build/config/linux/BUILD.gn
Trivial conflict after the upstream CL https://crrev.com/c/7539430 which
reverted "Reland "Enable BTI for Linux on Arm targets"".

//chrome/browser/ui/views/profiles/avatar_toolbar_button_state_manager.cc
Trivial conflict after the upstream CL https://crrev.com/c/7531971 which
renamed HistorySyncOptinStateProvider to PromoStateProvider as it
handles different type of promos, and not only Historysync. Neva
supports Clang and doesn't use GCC since M142, so removed Neva GCC
workaround as no more needed.

Issue: NEVA-11034
@CLAassistant
Copy link

CLAassistant commented Feb 25, 2026

CLA assistant check
All committers have signed the CLA.

@Vanya-PIP Vanya-PIP merged commit 19a277d into neva-main-rolling-7669 Feb 25, 2026
1 of 3 checks passed
@Vanya-PIP Vanya-PIP deleted the neva-main-rolling-7669-adaptation branch February 25, 2026 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants