Snap for 10447354 from 40214b48188358a80b7478bfff21d4814dd9177c to mainline-cellbroadcast-releaseaml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000android14-mainline-cellbroadcast-release

Change-Id: Iab10affc9aca7bb19286273919eafe394c92241d

1 files changed, 52 insertions, 44 deletions

diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
index 7c4afd32..7c296af9 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
@@ -25,18 +25,20 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-mno-movbe",
@@ -48,11 +50,11 @@
             "-Woverride-init",
             "-Wunsafe-loop-optimizations",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -75,27 +77,29 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-Wno-#warnings",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -118,27 +122,29 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-Wno-error=uninitialized",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -161,27 +167,29 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-error=implicit-int",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
             "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-someflag",
             "main.cc",
-            "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
-            "-Wno-unused-but-set-variable"
+            "-Wno-unused-but-set-variable",
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-string-concatenation"
           ]
         }
       }