Merge "Moved contents of clang_cflags into cflags" am: d3918d8d1e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2070647

Change-Id: I6fa5320d6de8d26c93bc3ed5818451c28160a712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix Espino 2022-05-03 17:35:10 +00:00 committed by Automerger Merge Worker
commit acb8def0db

View file

@ -130,12 +130,10 @@ cc_defaults {
"-Werror",
"-Wvla",
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
"-Wthread-safety",
],
rtti: true,
clang_cflags: [
"-Wthread-safety",
],
}
cc_binary {
@ -215,7 +213,7 @@ cc_defaults {
"-Werror",
"-Wunreachable-code",
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
"-D_FILE_OFFSET_BITS=64"
"-D_FILE_OFFSET_BITS=64",
],
target: {
@ -411,7 +409,7 @@ cc_test_host {
":fastboot_test_vendor_ramdisk_replace",
":fastboot_test_vendor_boot_v3",
":fastboot_test_vendor_boot_v4_without_frag",
":fastboot_test_vendor_boot_v4_with_frag"
":fastboot_test_vendor_boot_v4_with_frag",
],
}