From ce2474ff60c9ca0a9a5747e6e401abb284d8378f Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Wed, 9 Nov 2022 19:55:31 -0500
Subject: [PATCH] [gn build] port a11cd0d94ed3 (gtest llvm/utils/unittest ->
 third-party/unittest)

---
 llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn   | 2 +-
 .../gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn   | 2 +-
 .../clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn     | 2 +-
 .../clang-tools-extra/unittests/clang-change-namespace/BUILD.gn       | 2 +-
 .../utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn | 2 +-
 .../clang-tools-extra/unittests/clang-include-fixer/BUILD.gn          | 2 +-
 .../unittests/clang-include-fixer/find-all-symbols/BUILD.gn           | 2 +-
 .../gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn      | 2 +-
 .../gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn     | 2 +-
 .../gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn                    | 2 +-
 llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn                  | 2 +-
 llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn          | 2 +-
 llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn  | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn             | 2 +-
 .../gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn          | 2 +-
 .../gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn  | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn                  | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn                 | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn       | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn       | 2 +-
 llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn  | 2 +-
 .../gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/llvm/test/BUILD.gn                            | 4 ++--
 llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn                   | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn          | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn       | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn         | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn         | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn  | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn       | 2 +-
 .../gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn   | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn                    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn         | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn             | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn                    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn                    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn                   | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn                | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn           | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn               | 2 +-
 .../utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn              | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn         | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn            | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn           | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn       | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn               | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn     | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn  | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn                  | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn | 2 +-
 .../gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn  | 2 +-
 .../gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn   | 2 +-
 .../gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn     | 2 +-
 .../gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn  | 2 +-
 .../gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn      | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn        | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn    | 2 +-
 llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn    | 2 +-
 llvm/utils/gn/secondary/{llvm/utils => third-party}/unittest/BUILD.gn | 0
 .../{llvm/utils => third-party}/unittest/UnitTestMain/BUILD.gn        | 0
 .../gn/secondary/{llvm/utils => third-party}/unittest/unittest.gni    | 4 ++--
 113 files changed, 113 insertions(+), 113 deletions(-)
 rename llvm/utils/gn/secondary/{llvm/utils => third-party}/unittest/BUILD.gn (100%)
 rename llvm/utils/gn/secondary/{llvm/utils => third-party}/unittest/UnitTestMain/BUILD.gn (100%)
 rename llvm/utils/gn/secondary/{llvm/utils => third-party}/unittest/unittest.gni (95%)

diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
index df95629..b65db84 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn
@@ -1,5 +1,5 @@
 import("//clang-tools-extra/clangd/quality/gen_decision_forest.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 gen_decision_forest("DecisionForestRuntimeTest") {
   model = "decision_forest_model"
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
index d87d3d2..9d12a5c 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangdXpcTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
index 01848f9..a466bb5 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/unittests/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangPseudoTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
index cdd30c9..ff55251 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangApplyReplacementsTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
index 1e1161b..058d931 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangChangeNamespaceTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
index 9a6415c..17ee6c3 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-doc/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangDocTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
index ad0732d..201f027 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangIncludeFixerTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
index 87bfaa9..1c64b55 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("FindAllSymbolsTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
index 5fa983f..1663829 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangMoveTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
index 7c5d774..af9301a 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-query/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangQueryTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
index 6ae3d63..97f1bec 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangTidyTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
index 00cb464..78b4bac 100644
--- a/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
@@ -5,7 +5,7 @@ static_library("Testing") {
   deps = [
     "//clang/lib/Basic",
     "//llvm/lib/Support",
-    "//llvm/utils/unittest:gtest",
+    "//third-party/unittest:gtest",
   ]
   sources = [
     "CommandLineArgs.cpp",
diff --git a/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
index aa4f15a..b374915 100644
--- a/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/AST/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ASTTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
index fb0511d..5d6e484 100644
--- a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ASTMatchersTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
index 025f16e..f419748 100644
--- a/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/ASTMatchers/Dynamic/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DynamicASTMatchersTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
index 5e104ed..b1c376a 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Analysis/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangAnalysisTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
index 12662f7..9b07b8d 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Analysis/FlowSensitive/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangAnalysisFlowSensitiveTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
index bd80369..46cea0c 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Basic/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("BasicTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
index 54a0600..4e96aae 100644
--- a/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/CodeGen/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangCodeGenTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
index 4f87006..158b90f 100644
--- a/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("CrossTUTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
index 2443a61..346fac1 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Driver/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangDriverTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
index ef77e7e..bc6ffca 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Format/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("FormatTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
index 6d69aac..32cd6e4 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Frontend/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("FrontendTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
index 60f211f..0bccfff 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("IndexTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
index 26d2e2c..83bbef5 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangReplInterpreterTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
index ea52221..a269e01 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangReplInterpreterExceptionTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
index cac9b01..687ac2b 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Introspection/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("IntrospectionTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
index 1493bff..635ed39 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Lex/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LexTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
index 54c0dba..10c9224 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Rename/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangRenameTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
index daf2508..52003f8 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Rewrite/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("RewriteTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
index f75566b..817f480 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Sema/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("SemaTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
index ba912a1..dc65bf6 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("SerializationTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
index 6a06d46..d374114 100644
--- a/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/StaticAnalyzer/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("StaticAnalysisTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
index fe6262e..ff68e15 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Support/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ClangSupportTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
index 37e45e0..ab65370 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ToolingTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
index a7342b1..0f35297 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Tooling/Syntax/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("SyntaxTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
index 4f6681a..a1c84d0 100644
--- a/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("libclangTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
index 37f277d0..fa261aa 100644
--- a/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("libclangCrashTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
index 757871a..452c19f 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/tests/BUILD.gn
@@ -1,5 +1,5 @@
 import("//llvm/utils/gn/build/toolchain/compiler.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 test_cflags = [ "-DSCUDO_DEBUG=1" ]
 
diff --git a/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
index cdc4230..6d7d525 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn
@@ -2,7 +2,7 @@ static_library("Support") {
   output_name = "LLVMTestingSupport"
   deps = [
     "//llvm/lib/Support",
-    "//llvm/utils/unittest:gtest",
+    "//third-party/unittest:gtest",
   ]
   sources = [
     "Annotations.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index d372f68..38729e0 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -319,11 +319,11 @@ group("test") {
     "//llvm/utils/llvm-locstats",
     "//llvm/utils/not",
     "//llvm/utils/split-file",
+    "//llvm/utils/yaml-bench",
 
     # llvm-config wants libgtest_main.a to exist at runtime when run as in
     # its tests, but nothing in the tree depends on them.
-    "//llvm/utils/unittest/UnitTestMain:gtest_main",
-    "//llvm/utils/yaml-bench",
+    "//third-party/unittest/UnitTestMain:gtest_main",
   ]
   if (host_os != "win") {
     # loadable_modules don't work on Windows.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
index 54e8a8e..7b7b800 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ADTTests") {
   # ADT is a headers-only library so there's no //llvm/lib/ADT to depend on.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
index f76ed7d..6818c88 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("AnalysisTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
index ca576b1..a5eac2e 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("AsmParserTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
index 1c1951f..209b3c0 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BinaryFormat/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("BinaryFormatTests") {
   deps = [ "//llvm/lib/BinaryFormat" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
index 6200a0f..59d4075 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("BitcodeTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
index 336d646..20961a2 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("BitstreamTests") {
   deps = [ "//llvm/lib/Bitstream/Reader" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
index 8dece10..aecef6e 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("CodeGenTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
index 16f1f20..95ec74d 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("GlobalISelTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
index db28b4b..c74f2b2 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/CodeView/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoCodeViewTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
index a7c1d6a..9767d5f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/DWARF/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoDWARFTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
index 2750740..16c0faf 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoGSYMTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
index 579e7c7..ec938c8 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/LogicalView/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoLogicalViewTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
index 6c9bc06..8ee26a1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/MSF/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoMSFTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
index 5097969..dc474c4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/PDB/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoPDBTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
index f756f6d..7f4d9fd 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/Symbolizer/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebugInfoSymbolizerTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
index 2aefe6c..d95e58b 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Debuginfod/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DebuginfodTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
index 4da0db7..7daa3a4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Demangle/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("DemangleTests") {
   deps = [ "//llvm/lib/Demangle" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
index 095ca3e..e5c58c1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ExecutionEngineTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
index 3177d26..f95734c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("JITLinkTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
index eed7d73..aa1f38c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/MCJIT/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("MCJITTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
index e91b830..02f0feb 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/Orc/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("OrcJITTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
index 22c81e2..2e80242 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("FileCheckTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
index 0a5031f..ea483bb 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMFrontendTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
index 2967ddc..1ef49ba 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/FuzzMutate/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("FuzzMutateTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
index 672d372..bfcc4f4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("IRTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
index cb50888..0376ff6 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/InterfaceStub/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("InterfaceStubTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
index f2daa81..eb211b9 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LineEditorTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
index ab88ae9..8e6a5b2 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LinkerTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
index 0ddca65..48726e5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("AMDGPUDwarfTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
index 45497d3..6227b62 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("MCTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
index 637fc34..7a6095f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("SystemZAsmLexerTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
index a66c322..92fb60a 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/X86/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("X86MCTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
index 6ac92ec..df15d82 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("MITests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
index c6dd5ae..a93a846 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MIR/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("MIRTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
index 58c1681..003a1f3 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ObjCopy/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ObjCopyTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
index 1c4a32e..1eaaf70 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Object/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ObjectTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
index a8861ba..a3a088e 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ObjectYAMLTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
index 13d80ef..46f3ff9 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
@@ -1,5 +1,5 @@
 import("//llvm/utils/TableGen/tablegen.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 tablegen("Opts") {
   visibility = [ ":OptionTests" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
index 29e4183..e38df36 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 # Keyed off LLVM_ENABLE_PLUGINS in the CMake build, which is usually false
 # on Windows and true elsewhere.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
index 7b848a4..a022c4c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ProfileDataTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
index 2fdd613..224c763 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("RemarksTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
index 619020c..3d869de 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("SupportTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
index 28c0b4b..dd82c3b 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 # FIXME: If we add -Wl,-z,nodelete to the global ldflags, we need to remove
 # it again for these tests (cf CMake).
diff --git a/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
index 2dae703..ce04c96 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/TableGen/BUILD.gn
@@ -1,5 +1,5 @@
 import("//llvm/utils/TableGen/tablegen.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 tablegen("AutomataAutomata") {
   visibility = [ ":TableGenTests" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
index ed694f9..4f94ecd 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/AArch64/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("AArch64Tests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
index 68b127ab..1c579b4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("AMDGPUTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
index b13adf2..6d81e30 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ARMTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
index 5b21156..babc171 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/DirectX/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 # This test is currently not referenced by anything, it only exists
 # to make sync_source_lists_from_cmake.py happy.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
index 85a15fb..f0beddd 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("PowerPCTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
index e5a3dda..190b9af 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("WebAssemblyTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
index b181780..423d31b 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("X86Tests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
index 94fe2cd..bc41019 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Testing/ADT/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("TestingADTTests") {
   deps = [ "//llvm/lib/Support" ]
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
index 590148d..88b8002 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Testing/Support/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("TestingSupportTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
index 0ebeb4f..f4f4345 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/TextAPI/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("TextAPITests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
index 904ee9c..bb1b273 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/IPO/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("IPOTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
index 493a282..097b555 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Scalar/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("ScalarTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
index 556527c..15e3518 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("UtilsTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
index 218ef86..e44d632 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Vectorize/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("VectorizeTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
index 003bfc0..1e64302 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/XRay/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("XRayTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
index e25d838..7a401b1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("CFIVerifyTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
index d7a5b09..701c930 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMExegesisAArch64Tests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
index 141b30b..697d722 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMExegesisARMTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
index 9eb3c9d..c43624e 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMExegesisTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
index a7e00a9..679d632 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/Mips/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMExegesisMipsTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
index ef4a384..06221c1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/PowerPC/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMExegesisPowerPCTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
index 9807b58..37102b6 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/X86/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMExegesisX86Tests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
index 9d79fb7..192b812 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/BUILD.gn
@@ -1,5 +1,5 @@
 import("//llvm/lib/Target/targets.gni")
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMMCATests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
index f43473d..7819c73 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-mca/X86/BUILD.gn
@@ -3,7 +3,7 @@ source_set("X86") {
   testonly = true
   deps = [
     "//llvm/lib/Target/X86",
-    "//llvm/utils/unittest:gtest",
+    "//third-party/unittest:gtest",
 
     # This test target reaches inside the Target/X86 tablegen internals and must
     # depend on this Target/X86-internal build target.
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
index 835bc7c..b53b84d 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-profgen/BUILD.gn
@@ -1,4 +1,4 @@
-import("//llvm/utils/unittest/unittest.gni")
+import("//third-party/unittest/unittest.gni")
 
 unittest("LLVMProfgenTests") {
   deps = [
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn b/llvm/utils/gn/secondary/third-party/unittest/BUILD.gn
similarity index 100%
rename from llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
rename to llvm/utils/gn/secondary/third-party/unittest/BUILD.gn
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn b/llvm/utils/gn/secondary/third-party/unittest/UnitTestMain/BUILD.gn
similarity index 100%
rename from llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
rename to llvm/utils/gn/secondary/third-party/unittest/UnitTestMain/BUILD.gn
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni b/llvm/utils/gn/secondary/third-party/unittest/unittest.gni
similarity index 95%
rename from llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
rename to llvm/utils/gn/secondary/third-party/unittest/unittest.gni
index f0c8309..ab85459 100644
--- a/llvm/utils/gn/secondary/llvm/utils/unittest/unittest.gni
+++ b/llvm/utils/gn/secondary/third-party/unittest/unittest.gni
@@ -45,9 +45,9 @@ template("unittest") {
     output_dir = target_out_dir
 
     if (has_custom_main) {
-      deps += [ "//llvm/utils/unittest:gtest" ]
+      deps += [ "//third-party/unittest:gtest" ]
     } else {
-      deps += [ "//llvm/utils/unittest/UnitTestMain" ]
+      deps += [ "//third-party/unittest/UnitTestMain" ]
     }
     testonly = true
   }
-- 
2.7.4