commit f0f609da48f0ce1fa3e1919264159bd5449fda67
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 16 01:19:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 16 01:19:07 2022 +0000
tree 1d60520f54ac6e44e7a9839244e3edc428f9970a
parent 2a6007a65299bdbd9cfce9b5e52f9ef3b7175c5a
parent 1b17342331400e8ebeb17bca0fa12cb2626e810a

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

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

Change-Id: I64fab245b5892ffd9215f1c9af4402d439a1e476
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 1403e41..4ed7b32 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",