aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlix <agespino@google.com>2022-05-10 22:56:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-10 22:56:09 +0000
commite41ddc00ce1a4d6781121347efc507b6916e00ea (patch)
tree184792d42e01646ca7e694d0fc9df2f88cccfa1f
parentb7ba111e8c54beb68b59a59f424ffe42781ee293 (diff)
parent197b459f0796d6a790c54c6e7a687bd7e60a46b7 (diff)
downloadgoogle-breakpad-e41ddc00ce1a4d6781121347efc507b6916e00ea.tar.gz
Moved contents of clang_cflags into cflags am: ce5443941a am: 1f6fb5b29e am: bbd893d527 am: 197b459f07android-u-beta-1-gplmain-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/google-breakpad/+/2069495 Change-Id: Ib74e6bf03cc03b2512851c4d31d8dc4f6bcf7be8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index e0cd1593..d97c6c38 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,7 +101,7 @@ cc_library_static {
// Work around b/25435766 core2md segfault.
arch: {
x86: {
- clang_cflags: ["-mno-stackrealign"],
+ cflags: ["-mno-stackrealign"],
},
},
}
@@ -120,7 +120,7 @@ cc_binary {
// Work around b/25435766 core2md segfault.
arch: {
x86: {
- clang_cflags: ["-mno-stackrealign"],
+ cflags: ["-mno-stackrealign"],
},
},
cflags: [