commit c010a4becdced90ff1fedebc0e2ec249a210b308
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 27 21:37:40 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 27 21:37:40 2022 +0000
tree c940349d0d8552c3dce782e21780b100700784a0
parent 6796d80a2fa1038a6f435b8e1af7e80bcb731084
parent fe1aeadfccddf29083da07f7ad0b4d7ec9e2bccb

[automerger skipped] Merge "RESTRICT AUTOMERGE Ignore weak symbol difference in libc++ ABI check am: ddcf30d384 am: 76927ad594 am: 8c794379e0" into tm-qpr-dev-plus-aosp am: fe1aeadfcc -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcxx/+/18607875

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

Android.bp

diff --git a/Android.bp b/Android.bp
index a494eb4..4b01aa2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -180,10 +180,6 @@
             enabled: true,
         },
     },
-
-    header_abi_checker: {
-        diff_flags: ["-allow-adding-removing-weak-symbols"],
-    },
 }
 
 cc_library_static {