Snap for 6439596 from ccead650bb8e050400f55dc44b60f989b1f8e117 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I3464301d9b41d48e11dfd361a411d60a1bd5a429

1 files changed, 0 insertions, 419 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
deleted file mode 100644
index 61537a59..00000000
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ /dev/null
@@ -1,419 +0,0 @@
-[
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      },
-      "stdout": "somemessage",
-      "stderr": "someerror",
-      "exitcode": 1
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        },
-        "stdout": "somemessage",
-        "stderr": "someerror",
-        "exitcode": 1
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang++",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang++",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "env": [
-      "CLANG=somepath/clang"
-    ],
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "somepath/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "-Xclang-path=/somedir",
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang",
-          "args": [
-            "--print-resource-dir"
-          ]
-        },
-        "stdout": "someResourceDir"
-      },
-      {
-        "cmd": {
-          "path": "/somedir/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-resource-dir=someResourceDir",
-            "--gcc-toolchain=/usr",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "env": [
-      "GOMACC_PATH=/tmp/stable/gomacc"
-    ],
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "-Xclang-path=/somedir",
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang",
-          "args": [
-            "--print-resource-dir"
-          ]
-        },
-        "stdout": "someResourceDir"
-      },
-      {
-        "cmd": {
-          "path": "/somedir/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-resource-dir=someResourceDir",
-            "--gcc-toolchain=/usr",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./x86_64-cros-linux-gnu-clang",
-        "args": [
-          "-Xclang-path=/somedir",
-          "main.cc"
-        ]
-      },
-      "stdout": "somemessage",
-      "stderr": "someerror",
-      "exitcode": 1
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang",
-          "args": [
-            "--print-resource-dir"
-          ]
-        },
-        "stdout": "someResourceDir"
-      },
-      {
-        "cmd": {
-          "path": "/somedir/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-resource-dir=someResourceDir",
-            "--gcc-toolchain=/usr",
-            "main.cc"
-          ]
-        },
-        "stdout": "somemessage",
-        "stderr": "someerror",
-        "exitcode": 1
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "/tmp/stable/x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/a/b/c/d/e/f/g/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "./symlinked/x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/a/b/c/d/e/f/g/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "wrapper": {
-      "cmd": {
-        "path": "somedir/x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/somedir/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "wd": "/tmp/stable",
-    "env": [
-      "PATH=/tmp/stable/pathenv"
-    ],
-    "wrapper": {
-      "cmd": {
-        "path": "x86_64-cros-linux-gnu-clang",
-        "args": [
-          "main.cc"
-        ]
-      }
-    },
-    "cmds": [
-      {
-        "cmd": {
-          "path": "/tmp/stable/pathenv/clang",
-          "args": [
-            "-Qunused-arguments",
-            "-grecord-gcc-switches",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "main.cc"
-          ]
-        }
-      }
-    ]
-  }
-]