commit c28886628c457645f878d3e1fcc3184b4ff3934c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 16 00:07:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 16 00:07:04 2022 +0000
tree eae73a9b34b98ee751ca016abd012e26138a349a
parent 7956dd08445a65eb1b22612cd9274a5d8018ca9d
parent 265530ed85e5475802b6bbb5dd2150dd4200ec26

Merge "Do not set bugprone-branch-clone as error." am: 265530ed85

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2122472

Change-Id: Id382e6a6274970861e4811d3b73f229d83d2f893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 21d98e0..6d3c88d 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -216,6 +216,7 @@
         "abseil-*",
         "android-*",
         "bugprone-*",
+        "-bugprone-branch-clone", // b/155034972
         "cert-*",
         "clang-analyzer-*",
         "google-*",

libs/binder/ndk/Android.bp

diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index 79c8c8f..32e018d 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -113,6 +113,7 @@
         "abseil-*",
         "android-*",
         "bugprone-*",
+        "-bugprone-branch-clone", // b/155034972
         "cert-*",
         "clang-analyzer-*",
         "-clang-analyzer-core.CallAndMessage",