Move more clang build directories within third_party/llvm-build-tools

Doing a full build of clang locally left third_party/llvm-instrumented that wasn't in .gitignore.
We could add more entries to third_party/.gitignore, but it seems cleaner/more future-proof to stuff everything into one directory.

We can remove the now unused entries in third_party/.gitignore later once this patch sticks.

Change-Id: If2b8b320b619cb653aac1d3ba64aef50a797df84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3642435
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Arthur Eubanks <aeubanks@google.com>
Cr-Commit-Position: refs/heads/main@{#1002671}
NOKEYCHECK=True
GitOrigin-RevId: cc0560219977558b8c51164ae09cc11750a1ebdf
diff --git a/scripts/build.py b/scripts/build.py
index 1e4ae2c..78f4712 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -34,13 +34,13 @@
 THIRD_PARTY_DIR = os.path.join(CHROMIUM_DIR, 'third_party')
 LLVM_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm')
 COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'compiler-rt')
-LLVM_BOOTSTRAP_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-bootstrap')
-LLVM_BOOTSTRAP_INSTALL_DIR = os.path.join(THIRD_PARTY_DIR,
-                                          'llvm-bootstrap-install')
-LLVM_INSTRUMENTED_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-instrumented')
-LLVM_PROFDATA_FILE = os.path.join(LLVM_INSTRUMENTED_DIR, 'profdata.prof')
 LLVM_BUILD_TOOLS_DIR = os.path.abspath(
-    os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
+    os.path.join(THIRD_PARTY_DIR, 'llvm-build-tools'))
+LLVM_BOOTSTRAP_DIR = os.path.join(LLVM_BUILD_TOOLS_DIR, 'llvm-bootstrap')
+LLVM_BOOTSTRAP_INSTALL_DIR = os.path.join(LLVM_BUILD_TOOLS_DIR,
+                                          'llvm-bootstrap-install')
+LLVM_INSTRUMENTED_DIR = os.path.join(LLVM_BUILD_TOOLS_DIR, 'llvm-instrumented')
+LLVM_PROFDATA_FILE = os.path.join(LLVM_INSTRUMENTED_DIR, 'profdata.prof')
 ANDROID_NDK_DIR = os.path.join(
     CHROMIUM_DIR, 'third_party', 'android_ndk')
 FUCHSIA_SDK_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'fuchsia-sdk',