From 1adaf6c16ef5437394e7e0448543313afa0e17e5 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Mon, 7 Apr 2025 13:50:25 +0300 Subject: [PATCH] [cr136][Android] Disabled _CheckAndroidNullAwayAnnotatedClasses for some classes These files are not have enabled check at the upstream. Chromium change: https://source.chromium.org/chromium/chromium/src/+/224ee248b1cb706a8aaf58ea3fa173835fcea8b7 Reland "Add _CheckAndroidNullAwayAnnotatedClasses PRESUBMIT check" Doing a simpler check, not trying to figure out if the annotation is in the class declaration or on a method declaration. It would be very rare for a method to be annotation and not the class. This reverts commit ae8498e7516099f7e07b7477ecc6af65da6ade99. Reason for revert: Fixed version Original change's description: > Revert "Add _CheckAndroidNullAwayAnnotatedClasses PRESUBMIT check" > > This reverts commit cfe861e365f1c00b7dae00cae8cdcf69cf4123e1. > > Reason for revert: Doesn't ignore comments > > Original change's description: > > Add _CheckAndroidNullAwayAnnotatedClasses PRESUBMIT check > > > > Warn when a .java file is missing @NullMarked and @NullUnmarked. > > > > Temporarily disabled in //android_webview and //chrome while migrating. > > ... Bug: 404884589 Change-Id: I11d0ed28bf1941e72df5dcc457fb9d7e62dc89ac Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6381838 --- chromium_presubmit_config.json5 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/chromium_presubmit_config.json5 b/chromium_presubmit_config.json5 index edf2076d898..f644736ce05 100644 --- a/chromium_presubmit_config.json5 +++ b/chromium_presubmit_config.json5 @@ -154,6 +154,28 @@ ], "CheckStableMojomChanges": [ "components/brave_rewards/core/mojom/.*\\.mojom", + ], + // TODO(alexeybarabash): https://github.com/brave/brave-browser/issues/45245 + "_CheckAndroidNullAwayAnnotatedClasses": [ + "android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java", + "android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java", + "android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java", + "android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerCoordinator.java", + "android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java", + "android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java", + "android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java", + "android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java", + "android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java", + "android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java", + "android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java", + "android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java", + "android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java", + "android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java", + "android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java", + "android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java", + "android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java", + "browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java", + "browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubToolbarView.java", ] },