commit 8d0176459cfc11e28e9427a7eadcf7a42f654f62
author Alix <agespino@google.com> Wed May 11 02:38:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 11 02:38:09 2022 +0000
tree 184792d42e01646ca7e694d0fc9df2f88cccfa1f
parent ba3a9649bacc2b69d2dded26e4c6367b049bdc66
parent e41ddc00ce1a4d6781121347efc507b6916e00ea

Moved contents of clang_cflags into cflags am: ce5443941a am: 1f6fb5b29e am: bbd893d527 am: 197b459f07 am: e41ddc00ce

Original change: https://android-review.googlesource.com/c/platform/external/google-breakpad/+/2069495

Change-Id: I243d4f589eac8f3318f014e8fe260d4186f4a67e
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 e0cd159..d97c6c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,7 +101,7 @@
     // Work around b/25435766 core2md segfault.
     arch: {
         x86: {
-            clang_cflags: ["-mno-stackrealign"],
+            cflags: ["-mno-stackrealign"],
         },
     },
 }
@@ -120,7 +120,7 @@
     // Work around b/25435766 core2md segfault.
     arch: {
         x86: {
-            clang_cflags: ["-mno-stackrealign"],
+            cflags: ["-mno-stackrealign"],
         },
     },
     cflags: [