commit fc4557753d45c0ecf3b3b80561d54e0c37b3f7b6
author Alix Espino <agespino@google.com> Tue May 03 16:39:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 03 16:39:50 2022 +0000
tree 81ac75cfd5443296ca06d30edff246b94fc7555a
parent 505fc6000e199644bf7d3f2df4887b1b8272134f
parent 463426410dccca2ed8e2d8e7ae88bdcf4ba915ea

Merge "Moved contents of clang_cflags into cflags" am: edc8ebe82b am: d8423b9c58 am: 463426410d

Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/2070533

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

lib/Transforms/Vectorize/Android.bp

diff --git a/lib/Transforms/Vectorize/Android.bp b/lib/Transforms/Vectorize/Android.bp
index 5241822..6f0fc09 100644
--- a/lib/Transforms/Vectorize/Android.bp
+++ b/lib/Transforms/Vectorize/Android.bp
@@ -13,7 +13,7 @@
         "llvm-lib-defaults",
     ],
     srcs: ["*.cpp"],
-    clang_cflags: [
+    cflags: [
         "-Wno-user-defined-warnings",
     ],
 }

utils/TableGen/Android.bp

diff --git a/utils/TableGen/Android.bp b/utils/TableGen/Android.bp
index 337e3e7..734ad8f 100644
--- a/utils/TableGen/Android.bp
+++ b/utils/TableGen/Android.bp
@@ -16,7 +16,7 @@
         "libLLVMSupport",
         "libLLVMTableGen",
     ],
-    clang_cflags: [
+    cflags: [
         "-Wno-user-defined-warnings",
     ],
     target: {