Snap for 9286241 from 40214b48188358a80b7478bfff21d4814dd9177c to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r9android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-releaseandroid14-gsi

Change-Id: I709f9d23cce32c5c2c81fc2d5869983d17b416ed

1 files changed, 104 insertions, 88 deletions

diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
index b8b28cd9..8df51096 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
@@ -17,27 +17,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",
             "-fsanitize=kernel-address",
             "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"
           ]
         }
       }
@@ -61,27 +63,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",
             "-fsanitize=kernel-address",
             "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"
           ]
         }
       }
@@ -105,27 +109,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",
             "-fsanitize=kernel-address",
             "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"
           ]
         }
       }
@@ -149,27 +155,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",
             "-fsanitize=kernel-address",
             "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"
           ]
         }
       }
@@ -192,27 +200,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",
             "-fsanitize=fuzzer",
             "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"
           ]
         }
       }
@@ -236,28 +246,30 @@
           "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",
             "-fsanitize=address",
             "-fprofile-instr-generate",
             "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"
           ]
         }
       }
@@ -280,27 +292,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",
             "-fsanitize=address",
             "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"
           ]
         }
       }
@@ -323,27 +337,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",
             "-fprofile-instr-generate",
             "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"
           ]
         }
       }