Snap for 7199033 from 898f8d62d1305674635d1e341b5839154d4e6acd to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: I1a20ab2b89a4f0ad6ad0369219ba2a994fe42eb4

1 files changed, 48 insertions, 12 deletions

diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
index 69fb4410..080f1d48 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -26,9 +26,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -64,9 +67,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         },
         "stdout": "somemessage",
@@ -102,9 +108,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -140,9 +149,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -185,11 +197,14 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -235,11 +250,14 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -285,11 +303,14 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         },
         "stdout": "somemessage",
@@ -325,9 +346,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -360,9 +384,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -395,9 +422,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -430,9 +460,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }
@@ -468,9 +501,12 @@
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
+            "-Wno-compound-token-split-by-macro",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
-            "-Wno-implicit-int-float-conversion"
+            "-Wno-implicit-int-float-conversion",
+            "-Wno-compound-token-split-by-space",
+            "-Wno-string-concatenation"
           ]
         }
       }